mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-15 08:46:26 +02:00
Code

Merge branch 'ks/branch-set-upstream' 

A test title has been reworded to clarify it.

* ks/branch-set-upstream:
  t3200: clarify description of --set-upstream test
This commit is contained in:
Junio C Hamano 2018-06-18 11:23:23 -07:00
parent f300f5681e cf317877e3
commit 4229478639
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t3200-branch.sh
View File

@ -885,7 +885,7 @@ test_expect_success 'test --unset-upstream on a particular branch' '
test_must_fail git config branch.my14.merge
'
test_expect_success '--set-upstream fails' '
test_expect_success 'disabled option --set-upstream fails' '
test_must_fail git branch --set-upstream origin/master
'