summaryrefslogtreecommitdiff
path: root/t/t3200-branch.sh
diff options
context:
space:
mode:
authorKaartic Sivaraam <kaartic.sivaraam@gmail.com>2018-06-17 11:56:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-18 15:54:40 (GMT)
commitcf317877e3a893a145e6897f41ced676248066ec (patch)
treef0e5183138bace609f1a0fa0b4a5342a01ad8de5 /t/t3200-branch.sh
parent9c93ff7cc4b4b9f4b9c5769de6144fa81698796c (diff)
downloadgit-cf317877e3a893a145e6897f41ced676248066ec.zip
git-cf317877e3a893a145e6897f41ced676248066ec.tar.gz
git-cf317877e3a893a145e6897f41ced676248066ec.tar.bz2
t3200: clarify description of --set-upstream test
Support for the --set-upstream option was removed in 52668846ea (builtin/branch: stop supporting the "--set-upstream" option, 2017-08-17). The change did not completely remove the command due to an issue noted in the commit's log message. So, a test was added to ensure that a command which uses the '--set-upstream' option fails instead of silently acting as an alias for the '--set-upstream-to' option due to option parsing features. To avoid confusion, clarify that the option is disabled intentionally in the corresponding test description. The test is expected to be around as long as we intentionally fail on seeing the '--set-upstream' option which in turn we expect to do for a period of time after which we can be sure that existing users of '--set-upstream' are aware that the option is no longer supported. Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3200-branch.sh')
-rwxr-xr-xt/t3200-branch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 51738fb..18708ca 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -605,7 +605,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
'