From: Junio C Hamano Date: Wed, 27 Feb 2013 17:47:27 +0000 (-0800) Subject: Merge branch 'mh/maint-ceil-absolute' X-Git-Tag: v1.8.2-rc2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e07d2683de55f0e21b13a6724b59bdcd548b5d8;p=thirdparty%2Fgit.git Merge branch 'mh/maint-ceil-absolute' An earlier workaround designed to help people who list logical directories that will not match what getcwd(3) returns in the GIT_CEILING_DIRECTORIES had an adverse effect when it is slow to stat and readlink a directory component of an element listed on it. * mh/maint-ceil-absolute: Provide a mechanism to turn off symlink resolution in ceiling paths --- 3e07d2683de55f0e21b13a6724b59bdcd548b5d8 diff --cc Documentation/git.txt index 0847cdcc68,6bc18014cd..79aa8cd149 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -678,12 -653,19 +678,19 @@@ Git so take care if using Cogito etc The '--namespace' command-line option also sets this value. 'GIT_CEILING_DIRECTORIES':: - This should be a colon-separated list of absolute paths. - If set, it is a list of directories that Git should not chdir - up into while looking for a repository directory. - It will not exclude the current working directory or - a GIT_DIR set on the command line or in the environment. - (Useful for excluding slow-loading network directories.) + This should be a colon-separated list of absolute paths. If - set, it is a list of directories that git should not chdir up ++ set, it is a list of directories that Git should not chdir up + into while looking for a repository directory (useful for + excluding slow-loading network directories). It will not + exclude the current working directory or a GIT_DIR set on the + command line or in the environment. Normally, Git has to read + the entries in this list and resolve any symlink that + might be present in order to compare them with the current + directory. However, if even this access is slow, you + can add an empty entry to the list to tell Git that the + subsequent entries are not symlinks and needn't be resolved; + e.g., + 'GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink'. 'GIT_DISCOVERY_ACROSS_FILESYSTEM':: When run in a directory that does not have ".git" repository