Skip to content
Snippets Groups Projects
Commit cf317877 authored by Kaartic Sivaraam's avatar Kaartic Sivaraam Committed by Junio C Hamano
Browse files

t3200: clarify description of --set-upstream test


Support for the --set-upstream option was removed in 52668846
(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: default avatarKaartic Sivaraam <kaartic.sivaraam@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 9c93ff7c
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
'
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment