diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:23:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-18 11:23:23 -0700 |
| commit | 4229478639c1c03a763ead3e30645b05f5e93ea1 (patch) | |
| tree | 2b2dc1048a05556cbf5e12e8186b76a90230bd3e /t | |
| parent | f300f5681e88fdf1058139100cbb8f990f5029c5 (diff) | |
| parent | cf317877e3a893a145e6897f41ced676248066ec (diff) | |
| download | git-4229478639c1c03a763ead3e30645b05f5e93ea1.tar.gz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3200-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 69ea8202f4..08467982f6 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -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 ' |