git/setup.c, branch v1.7.2

Merge branch 'maint'

2010-07-20T18:29:30Z

* maint: t/README: clarify test_must_fail description Check size of path buffer before writing into it Conflicts: t/README

Check size of path buffer before writing into it

2010-07-20T16:17:39Z

This prevents a buffer overrun that could otherwise be triggered by creating a file called '.git' with contents gitdir: (something really long) Signed-off-by: Greg Brockman Signed-off-by: Junio C Hamano

Use dev_t for device id (st_dev) from stat in setup_git_directory_gently()

2010-07-14T14:57:08Z

The original declaration was int, which seems to cause trouble on my machine. It causes spurious "filesystem boundary" errors when running the testsuite. The cause seems to be $ stat -c%d . 2147549952 which is too large for a 32-bit int type. Using the correct type, dev_t, solves the issue. (Because I'm paranoid and forgetful, I checked -- yes, Unix v7 had dev_t.) Other uses of st_dev seem to be reasonably safe. fill_stat_cache_info truncates it to an 'unsigned int', but that value seems to be used only to validate the cache, and only if USE_STDEV is defined. Signed-off-by: Raja R Harinath Signed-off-by: Junio C Hamano

Merge branch 'maint'

2010-06-07T01:42:12Z

* maint: setup: document prefix

setup: document prefix

2010-06-05T15:41:39Z

Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano

Rename ONE_FILESYSTEM to DISCOVERY_ACROSS_FILESYSTEM

2010-04-04T22:55:29Z

If a missing ONE_FILESYSTEM defaults to true, the only users who set this variable set it to false to tell git not to limit the discovery to one filesystem; there are too many negations in one sentence to make a simple panda brain dizzy. Use the variable GIT_DISCOVERY_ACROSS_FILESYSTEM that changes the behaviour from the default "limit to one filesystem" to "cross the boundary as I ask you to"; makes the semantics much more straight forward. Signed-off-by: Junio C Hamano

GIT_ONE_FILESYSTEM: flip the default to stop at filesystem boundaries

2010-04-04T17:33:53Z

Regarding the new environment variable, Linus Torvalds writes on Tue, 30 Mar 2010 in : I suspect that it is _very_ unusual to have a source repo that crosses multiple filesystems, and the original reason for this patch-series seems to me to be likely to be more common than that multi-fs case. So having the logic go the other way would seem to match the common case, no? The "crossing filesystem boundary" condition is checked by comparing st_dev field in the result from stat(2). This is slightly worrysome if non-POSIX ports return different values in the field even for directories in the same work tree extracted to the same "filesystem". Erik Faye-Lund confirms that in the msysgit port st_dev is 0, so this should be safe, as "even Windows is safe" ;-) This will affect those who use /.git to cram /etc and /home/me in the same repostiory, /home is mounted from non-root filesystem, and a git operation is done from inside /home/me/src. But that is such a corner case we don't want to give preference over helping people who will benefit from having this default so that they do not have to suffer from slow automounters. Signed-off-by: Junio C Hamano

Add support for GIT_ONE_FILESYSTEM

2010-03-28T16:43:20Z

This patch makes git pay attention to the GIT_ONE_FILESYSTEM environment variable. When that variable is set, git will stop searching for a GIT_DIR when it attempts to cross a filesystem boundary. When working in an environment with too many automount points to make maintaining a GIT_CEILING_DIRECTORIES list enjoyable, GIT_ONE_FILESYSTEM gives the option of turning all such attempts off with one setting. Signed-off-by: Lars R. Damerow Signed-off-by: Junio C Hamano

truncate cwd string before printing error message

2010-03-28T16:19:11Z

Without this truncation the error message printed only shows the cwd from the start of the search, not where it failed. Signed-off-by: Lars R. Damerow Signed-off-by: Junio C Hamano

Merge branch 'nd/root-git'

2010-03-07T20:47:15Z

* nd/root-git: Add test for using Git at root of file system Support working directory located at root Move offset_1st_component() to path.c init-db, rev-parse --git-dir: do not append redundant slash make_absolute_path(): Do not append redundant slash Conflicts: setup.c sha1_file.c