Skip to contentSkip to conversation

setup.c: fix comment about order of .git directory discovery

PATCH In review SZEDER Gábor 2 participants 2 messages Dec 7, 2017 – Dec 8, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
setup.c +1 -1
index 03f51e056..b168d25db 100644
@@ -921,7 +921,7 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
 	 * - ../.git
 	 * - ../.git/
 	 * - ../ (bare)
-	 * - ../../.git/
+	 * - ../../.git
 	 *   etc.
 	 */
 	one_filesystem = !git_env_bool("GIT_DISCOVERY_ACROSS_FILESYSTEM", 0);
Signature · 1 line
2.15.1.338.g53352fef7
#1 lore raw
Quoted 5 lines · SZEDER Gábor

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.

I was confused at first, because your patch only changes to ".git/" to ".git". So there is no ordering change, only a swapping out of one for the other. But that pushes done the ".git/" into the "etc." which is below.

So I think this makes sense.

Thanks.

-Peff