[PATCH] branch.c: use the parsed branch name

Michael J Gruber· Aug 19, 2011, 11:45 UTC · lore

When setting up tracking info, branch.c uses the given branch specifier ("name"). Use the parsed name ("ref.buf") instead so that

git branch --set-upstream @{-1} foo

sets up tracking info for the previous branch rather than for a branch named "@{-1}".

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
That's actually 1 of n in my branch pattern series, but independent,
and ready to go now.

 branch.c                 |    2 +-
 t/t6040-tracking-info.sh |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

Show changes to 2 files +15 −1

branch.c, t/t6040-tracking-info.sh

diff --git a/branch.c b/branch.c
index c0c865a..d62cc01 100644
--- a/branch.c
+++ b/branch.c
@@ -210,7 +210,7 @@ void create_branch(const char *head,
 			 start_name);
 
 	if (real_ref && track)
-		setup_tracking(name, real_ref, track);
+		setup_tracking(ref.buf+11, real_ref, track);
 
 	if (!dont_change_ref)
 		if (write_ref_sha1(lock, sha1, msg) < 0)
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index a9b0ac1..19de5b1 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -110,4 +110,18 @@ test_expect_success '--set-upstream does not change branch' '
 	grep -q "^refs/heads/master$" actual &&
 	cmp expect2 actual2
 '
+
+test_expect_success '--set-upstream @{-1}' '
+	git checkout from-master &&
+	git checkout from-master2 &&
+	git config branch.from-master2.merge > expect2 &&
+	git branch --set-upstream @{-1} follower &&
+	git config branch.from-master.merge > actual &&
+	git config branch.from-master2.merge > actual2 &&
+	git branch --set-upstream from-master follower &&
+	git config branch.from-master.merge > expect &&
+	test_cmp expect2 actual2 &&
+	test_cmp expect actual
+'
+
 test_done

-- 
1.7.6.678.gaaad0

Junio C Hamano· Aug 19, 2011, 18:03 UTC · re: Michael J Gruber · lore

Re: [PATCH] branch.c: use the parsed branch name

Michael J Gruber <git@drmicha.warpmail.net> writes:

Show 9 quoted lines

> When setting up tracking info, branch.c uses the given branch specifier
> ("name"). Use the parsed name ("ref.buf") instead so that
>
> git branch --set-upstream @{-1} foo
>
> sets up tracking info for the previous branch rather than for a branch
> named "@{-1}".
>
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>

Thanks.

patchbranch.c: use the parsed branch name