From: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
To: Git mailing list <git@vger.kernel.org>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Robert P . J . Day" <rpjday@crashcourse.ca>
Subject: [PATCH] t3200: clarify description of --set-upstream test
Date: Thu, 14 Jun 2018 19:36:41 +0530 [thread overview]
Message-ID: <20180614140641.13752-1-kaartic.sivaraam@gmail.com> (raw)
In-Reply-To: <20180605112446.17016-1-szeder.dev@gmail.com>
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 <kaartic.sivaraam@gmail.com>
---
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
next prev parent reply other threads:[~2018-06-14 14:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 11:14 [PATCH] t3200-branch.sh: use "--set-upstream-to" in test Robert P. J. Day
2018-06-05 11:24 ` SZEDER Gábor
2018-06-05 11:34 ` Robert P. J. Day
2018-06-06 15:50 ` Kaartic Sivaraam
2018-06-14 14:06 ` Kaartic Sivaraam [this message]
2018-06-14 17:43 ` [PATCH] t3200: clarify description of --set-upstream test Junio C Hamano
2018-06-17 8:53 ` Kaartic Sivaraam
2018-06-17 11:56 ` [PATCH v2] " Kaartic Sivaraam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180614140641.13752-1-kaartic.sivaraam@gmail.com \
--to=kaartic.sivaraam@gmail.com \
--cc=git@vger.kernel.org \
--cc=rpjday@crashcourse.ca \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).