Merge branch 'aa/status-hilite-branch'

diff --git a/setup.c b/setup.c
index 346ef2eb2d678b742280c0816a09b8ca174ca799..14f91e39353bcfa1ee2b08d6a5b5f53a024a280c 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -512,8 +512,10 @@ const char *setup_git_directory_gently(int *nongit_ok)
        const char *prefix;
 
        prefix = setup_git_directory_gently_1(nongit_ok);
-       if (startup_info)
+       if (startup_info) {
                startup_info->have_repository = !nongit_ok || !*nongit_ok;
+               startup_info->prefix = prefix;
+       }
        return prefix;
 }