Merge branch 'js/gc-with-stale-symref' into maint

diff --git a/setup.c b/setup.c
index 5f9f07dcdb059ad6aeac8d90ee18aedf56a8f85e..a17c51e61d75ac8280bf04d95c50d7bdfd6d7a0e 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -402,9 +402,9 @@ static void update_linked_gitdir(const char *gitfile, const char *gitdir)
        struct strbuf path = STRBUF_INIT;
        struct stat st;
 
-       strbuf_addf(&path, "%s/gitfile", gitdir);
+       strbuf_addf(&path, "%s/gitdir", gitdir);
        if (stat(path.buf, &st) || st.st_mtime + 24 * 3600 < time(NULL))
-               write_file(path.buf, 0, "%s\n", gitfile);
+               write_file(path.buf, "%s", gitfile);
        strbuf_release(&path);
 }