diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:08:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:08:24 +0900 |
| commit | 79553b94f966f3cec6156a68001650ca26a584c4 (patch) | |
| tree | 37c0d1de2d26a28d67e06993819e8965dd25e942 /worktree.c | |
| parent | 5064d66f5bd86de2f8d5a4b021a616af57f5d8fa (diff) | |
| parent | 31824d180d4f975e6b130cd9a33a9a0baef3d7ca (diff) | |
| download | git-79553b94f966f3cec6156a68001650ca26a584c4.tar.gz | |
Merge branch 'nd/worktree-kill-parse-ref'
"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 e28ffbeb09..c0c5a2b373 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; |