From: Jeff King <peff@peff.net>
To: Garrett Cooper <yaneurabeya@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: [PATCH 1/5] t3200: test --set-upstream-to with bogus refs
Date: Tue, 2 Apr 2013 15:02:53 -0400 [thread overview]
Message-ID: <20130402190252.GA32316@sigill.intra.peff.net> (raw)
In-Reply-To: <20130402190134.GA17784@sigill.intra.peff.net>
These tests pass with the current code, but let's make sure
we don't accidentally break the behavior in the future.
Note that our tests expect failure when we try to set the
upstream to or from a missing branch. Technically we are
just munging config here, so we do not need the refs to
exist. But seeing that they do exist is a good check that
the user has not made a typo.
Signed-off-by: Jeff King <peff@peff.net>
---
t/t3200-branch.sh | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index b08c9f2..09f65f8 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -409,6 +409,18 @@ test_expect_success '--set-upstream-to fails on detached HEAD' '
git checkout -
'
+test_expect_success '--set-upstream-to fails on a missing dst branch' '
+ test_must_fail git branch --set-upstream-to master does-not-exist
+'
+
+test_expect_success '--set-upstream-to fails on a missing src branch' '
+ test_must_fail git branch --set-upstream-to does-not-exist master
+'
+
+test_expect_success '--set-upstream-to fails on a non-ref' '
+ test_must_fail git branch --set-upstream-to HEAD^{}
+'
+
test_expect_success 'use --set-upstream-to modify HEAD' '
test_config branch.master.remote foo &&
test_config branch.master.merge foo &&
--
1.8.2.rc0.33.gd915649
next prev parent reply other threads:[~2013-04-02 19:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 17:07 [BUG] inconsistent behavior with --set-upstream vs --set-upstream-to Garrett Cooper
2013-04-02 17:23 ` Jeff King
2013-04-02 17:30 ` Garrett Cooper
2013-04-02 17:51 ` Jeff King
2013-04-02 19:01 ` [RFC/PATCH 0/5] branch --set-upstream-to error-message improvements Jeff King
2013-04-02 19:02 ` Jeff King [this message]
2013-04-02 19:03 ` [PATCH 2/5] branch: factor out "upstream is not a branch" error messages Jeff King
2013-04-02 19:36 ` Garrett Cooper
2013-04-02 19:36 ` Garrett Cooper
2013-04-02 19:04 ` [PATCH 3/5] branch: improve error message for missing --set-upstream-to ref Jeff King
2013-04-02 19:04 ` [PATCH 4/5] branch: mention start_name in set-upstream error messages Jeff King
2013-04-02 19:39 ` Garrett Cooper
2013-04-02 19:05 ` [PATCH 5/5] branch: give advice when tracking start-point is missing Jeff King
2013-04-02 21:50 ` [RFC/PATCH 0/5] branch --set-upstream-to error-message improvements Junio C Hamano
2013-04-02 19:08 ` [BUG] inconsistent behavior with --set-upstream vs --set-upstream-to Jonathan Nieder
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=20130402190252.GA32316@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=yaneurabeya@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).