undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mg/branch-set-upstream-previous'

Browse Source 
* mg/branch-set-upstream-previous:
  branch.c: use the parsed branch name
This commit is contained in:
Junio C Hamano 2011-08-25 16:00:49 -07:00
commit b0578c9abe
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
branch.c
View File

@ -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)

14
t/t6040-tracking-info.sh
View File

@ -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