Skip to content

Commit cf31787

Browse files
sivaraamgitster
authored andcommitted
t3200: clarify description of --set-upstream test
Support for the --set-upstream option was removed in 5266884 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9c93ff7 commit cf31787

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t3200-branch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ test_expect_success 'test --unset-upstream on a particular branch' '
605605
test_must_fail git config branch.my14.merge
606606
'
607607

608-
test_expect_success '--set-upstream fails' '
608+
test_expect_success 'disabled option --set-upstream fails' '
609609
test_must_fail git branch --set-upstream origin/master
610610
'
611611

0 commit comments

Comments
 (0)