diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-23 14:14:16 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-23 14:14:16 +0900 |
| commit | 5253ad109af7691d0b0fb3c9670aaaf775412c72 (patch) | |
| tree | 00292a2eec45efa23eb82c27471f0730dd78a85d /worktree.c | |
| parent | 4c2224e83951a685185bb8c1f83b28e22fee0e27 (diff) | |
| parent | 31824d180d4f975e6b130cd9a33a9a0baef3d7ca (diff) | |
| download | git-5253ad109af7691d0b0fb3c9670aaaf775412c72.tar.gz git-5253ad109af7691d0b0fb3c9670aaaf775412c72.tar.xz | |
Merge branch 'nd/worktree-kill-parse-ref' into maint
"git branch -M a b" while on a branch that is completely unrelated
to either branch a or branch b misbehaved when multiple worktree
was in use. This has been fixed.
* nd/worktree-kill-parse-ref:
branch: fix branch renaming not updating HEADs correctly
Diffstat (limited to 'worktree.c')
| -rw-r--r-- | worktree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/worktree.c b/worktree.c index e28ffbeb0..c0c5a2b37 100644 --- a/worktree.c +++ b/worktree.c @@ -30,7 +30,7 @@ static void add_head_info(struct worktree *wt) target = refs_resolve_ref_unsafe(get_worktree_ref_store(wt), "HEAD", - RESOLVE_REF_READING, + 0, wt->head_sha1, &flags); if (!target) return; |