mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ci/forbid-unwanted-current-branch-update'

Browse Source 
* ci/forbid-unwanted-current-branch-update:
  branch --set-upstream: regression fix
This commit is contained in:
Junio C Hamano
2011-09-16 21:48:10 -07:00
parent 26e4266f2f fa79937675
commit c103e9529c
5 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
t/t3200-branch.sh
View File

@ -554,4 +554,17 @@ test_expect_success 'attempt to delete a branch merged to its base' '
test_must_fail git branch -d my10
'
test_expect_success 'use set-upstream on the current branch' '
git checkout master &&
git --bare init myupstream.git &&
git push myupstream.git master:refs/heads/frotz &&
git remote add origin myupstream.git &&
git fetch &&
git branch --set-upstream master origin/frotz &&
test "z$(git config branch.master.remote)" = "zorigin" &&
test "z$(git config branch.master.merge)" = "zrefs/heads/frotz"
'
test_done