summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder.dev@gmail.com>2017-12-07 09:59:49 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-12-07 08:09:06 -0800
commit176b2d328ccc305aa2e565c39ad7b0fb24099275 (patch)
tree15e1149599e9c2898fd980c51fba8e9fed72895b
parentGit 2.12.5 (diff)
downloadtgif-176b2d328ccc305aa2e565c39ad7b0fb24099275.tar.xz
setup.c: fix comment about order of .git directory discovery
Since gitfiles were introduced in b44ebb19e (Add platform-independent .git "symlink", 2008-02-20) the order of checks during .git directory discovery is: gitfile, gitdir, bare repo. However, that commit did only partially update the in-code comment describing this order, missing the last line which still puts gitdir before gitfile. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.c b/setup.c
index 8f64fbdfb2..caab366104 100644
--- a/setup.c
+++ b/setup.c
@@ -882,7 +882,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
* - ../.git
* - ../.git/
* - ../ (bare)
- * - ../../.git/
+ * - ../../.git
* etc.
*/
one_filesystem = !git_env_bool("GIT_DISCOVERY_ACROSS_FILESYSTEM", 0);