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 and doesn't silently act as an alias for the '--set-upstream-to' option due to option parsing features. To avoid confusion, clarify that the option is an unsupported one in the corresponding test description. Signed-off-by: Kaartic Sivaraam <[email protected]> --- t/t3200-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 6c0b7ea4a..d14de82ba 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -884,7 +884,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 'unsupported option --set-upstream fails' ' test_must_fail git branch --set-upstream origin/master ' -- 2.18.0.rc1.242.g61856ae69
