Merge branch 'jc/am-state-fix'

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