diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-01 16:31:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-01 16:31:07 -0700 |
| commit | 91d54694a4e1da804063ce64b9757d5d3148e6ad (patch) | |
| tree | 76e7ad71adb050aff775e1049455493c9b1952ae | |
| parent | Eighth batch for 2.6 (diff) | |
| parent | setup: update the right file in multiple checkouts (diff) | |
| download | tgif-91d54694a4e1da804063ce64b9757d5d3148e6ad.tar.xz | |
Merge branch 'nd/fixup-linked-gitdir'
The code in "multiple-worktree" support that attempted to recover
from an inconsistent state updated an incorrect file.
* nd/fixup-linked-gitdir:
setup: update the right file in multiple checkouts
| -rw-r--r-- | setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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_gently(path.buf, "%s", gitfile); + write_file(path.buf, "%s", gitfile); strbuf_release(&path); } |