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 /t | |
| parent | Prepare for 2.14.3 (diff) | |
| parent | branch: fix branch renaming not updating HEADs correctly (diff) | |
| download | tgif-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 't')
| -rwxr-xr-x | t/t3200-branch.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 9d707d2a40..5fc2fb425b 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -162,6 +162,19 @@ test_expect_success 'git branch -M baz bam should add entries to .git/logs/HEAD' grep "^0\{40\}.*$msg$" .git/logs/HEAD ' +test_expect_success 'git branch -M should leave orphaned HEAD alone' ' + git init orphan && + ( + cd orphan && + test_commit initial && + git checkout --orphan lonely && + grep lonely .git/HEAD && + test_path_is_missing .git/refs/head/lonely && + git branch -M master mistress && + grep lonely .git/HEAD + ) +' + test_expect_success 'resulting reflog can be shown by log -g' ' oid=$(git rev-parse HEAD) && cat >expect <<-EOF && |