Skip to content

Commit 82fde87

Browse files
pcloudsgitster
authored andcommitted
setup: update the right file in multiple checkouts
This code is introduced in 23af91d (prune: strategies for linked checkouts - 2014-11-30), and it's supposed to implement this rule from that commit's message: - linked checkouts are supposed to keep its location in $R/gitdir up to date. The use case is auto fixup after a manual checkout move. Note the name, "$R/gitdir", not "$R/gitfile". Correct the path to be updated accordingly. While at there, make sure I/O errors are not silently dropped. Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a17c56c commit 82fde87

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

setup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,9 @@ static void update_linked_gitdir(const char *gitfile, const char *gitdir)
402402
struct strbuf path = STRBUF_INIT;
403403
struct stat st;
404404

405-
strbuf_addf(&path, "%s/gitfile", gitdir);
405+
strbuf_addf(&path, "%s/gitdir", gitdir);
406406
if (stat(path.buf, &st) || st.st_mtime + 24 * 3600 < time(NULL))
407-
write_file(path.buf, 0, "%s\n", gitfile);
407+
write_file(path.buf, 1, "%s\n", gitfile);
408408
strbuf_release(&path);
409409
}
410410

0 commit comments

Comments
 (0)