Junio C Hamano <gitster@xxxxxxxxx> writes:
> My understanding of the next step was for those who are interested
> in moving this topic forward to update these patches in that
> direction.
Well, I am one of those who are interested in moving this topic
forward, not because I'm likely to use it, but because the fewer
number of topics I have to keep in flight, the easier my work gets.
So here is such an update. As the topic is not in 'next' yet, it
could also be implemented by replacing patch(es) in the series, but
doing it as a follow-up fix made it easier to see what got changed
(both in the code and in the tests), so that is how I decided to do
this patch.
-- >8 --
Subject: [PATCH] branch: fix "copy" to never touch HEAD
Probably because "git branch -c A B" piggybacked its implementation
on "git branch -m A B", when creating a new branch B by copying the
branch A that happens to be the current branch, it also updated HEAD
to point at the new branch.
This does not match the usual expectation. If I were sitting on a
blue chair, and somebody comes and repaints it to red, I would
accept ending up sitting on a red chair, but if somebody creates a
new red chair, modelling it after the blue chair I am sitting on, I
do not expect to be booted off of the blue chair and ending up on
sitting on the red one.
Let's fix this strange behaviour before it hits 'next'. Those who
want to create a new branch and switch to it can do "git checkout B"
after creating it by copying the current branch, or if that is so
useful to deserve a short-hand way to do so, perhaps extend "git
checkout -b B" to copy configurations while creating the new branch
B. A "copy" should remain to be "copy", not "copy and sometimes
checkout".
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
builtin/branch.c | 9 +++------
t/t3200-branch.sh | 10 +++++-----
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index 89f64f4123..e2e3692838 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -506,12 +506,9 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
oldref.buf + 11);
}
- if (replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf)) {
- if (copy)
- die(_("Branch copied to %s, but HEAD is not updated!"), newname);
- else
- die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
- }
+ if (!copy &&
+ replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf))
+ die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
strbuf_release(&logmsg);
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 5d03ad16f6..be9b3784c6 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -422,7 +422,7 @@ test_expect_success 'git branch --copy is a synonym for -c' '
test_cmp expect actual
'
-test_expect_success 'git branch -c ee ef should copy and checkout branch ef' '
+test_expect_success 'git branch -c ee ef should copy to create branch ef' '
git checkout -b ee &&
git reflog exists refs/heads/ee &&
git config branch.ee.dummy Hello &&
@@ -431,7 +431,7 @@ test_expect_success 'git branch -c ee ef should copy and checkout branch ef' '
git reflog exists refs/heads/ef &&
test $(git config branch.ee.dummy) = Hello &&
test $(git config branch.ef.dummy) = Hello &&
- test $(git rev-parse --abbrev-ref HEAD) = ef
+ test $(git rev-parse --abbrev-ref HEAD) = ee
'
test_expect_success 'git branch -c f/f g/g should work' '
@@ -494,12 +494,12 @@ test_expect_success 'git branch -C c1 c2 should succeed when c1 is checked out'
git checkout -b c1 &&
git branch c2 &&
git branch -C c1 c2 &&
- test $(git rev-parse --abbrev-ref HEAD) = c2
+ test $(git rev-parse --abbrev-ref HEAD) = c1
'
-test_expect_success 'git branch -C c1 c2 should add entries to .git/logs/HEAD' '
+test_expect_success 'git branch -C c1 c2 should never touch HEAD' '
msg="Branch: copied refs/heads/c1 to refs/heads/c2" &&
- grep "$msg$" .git/logs/HEAD
+ ! grep "$msg$" .git/logs/HEAD
'
test_expect_success 'git branch -C master should work when master is checked out' '
--
2.14.1-907-g5aa63875cf
