Eliminate an unnecessary chdir("..")

In the case where setup_git_directory_gently fails, avoid the last
chdir("..") by moving it after the ceil_offset check.

Signed-off-by: David Reiss <dreiss@facebook.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/setup.c b/setup.c
index c14b10636faed05a47b4fb755768c4650a1ead76..045ca20b32f4b512e175601fb371ac54dfce8cee 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -446,7 +446,6 @@ const char *setup_git_directory_gently(int *nongit_ok)
                        check_repository_format_gently(nongit_ok);
                        return NULL;
                }
-               chdir("..");
                while (--offset > ceil_offset && cwd[offset] != '/');
                if (offset <= ceil_offset) {
                        if (nongit_ok) {
@@ -457,6 +456,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
                        }
                        die("Not a git repository");
                }
+               chdir("..");
        }
 
        inside_git_dir = 0;