Skip to content

Commit

Permalink
t3200: clarify description of --set-upstream test
Browse files Browse the repository at this point in the history
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 <kaartic.sivaraam@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
sivaraam authored and gitster committed Jun 18, 2018
1 parent 9c93ff7 commit cf31787
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion t/t3200-branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
'

Expand Down

0 comments on commit cf31787

Please sign in to comment.