From: Brian Gesiak <modocache@gmail.com>
To: git@vger.kernel.org
Cc: modocache <modocache@gmail.com>
Subject: [PATCH 1/2] t3200-branch: test setting branch as own upstream
Date: Fri, 28 Feb 2014 12:04:18 +0900 [thread overview]
Message-ID: <1393556659-32717-1-git-send-email-modocache@gmail.com> (raw)
From: modocache <modocache@gmail.com>
No test asserts that "git branch -u refs/heads/my-branch my-branch"
emits a warning. Add a test that does so.
Signed-off-by: Brian Gesiak <modocache@gmail.com>
---
t/t3200-branch.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index fcdb867..f70b96f 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -507,6 +507,14 @@ EOF
test_cmp expected actual
'
+test_expect_success '--set-upstream-to shows warning if used to set branch as own upstream' '
+ git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
+ cat >expected <<EOF &&
+warning: Not setting branch my13 as its own upstream.
+EOF
+ test_cmp expected actual
+'
+
# Keep this test last, as it changes the current branch
cat >expect <<EOF
$_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
--
1.8.3.4 (Apple Git-47)
next reply other threads:[~2014-02-28 3:04 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-28 3:04 Brian Gesiak [this message]
2014-02-28 3:04 ` [PATCH 2/2] branch: use skip_prefix Brian Gesiak
2014-02-28 5:46 ` Jeff King
2014-03-03 19:54 ` Junio C Hamano
2014-02-28 5:37 ` [PATCH 1/2] t3200-branch: test setting branch as own upstream Jeff King
2014-02-28 6:17 ` Brian Gesiak
2014-02-28 6:27 ` Jeff King
2014-02-28 22:15 ` brian m. carlson
2014-02-28 6:55 ` Johannes Sixt
2014-02-28 7:14 ` Jeff King
2014-02-28 7:26 ` Jeff King
2014-02-28 7:28 ` Brian Gesiak
2014-02-28 8:37 ` Jeff King
2014-02-28 10:44 ` Brian Gesiak
2014-02-28 10:59 ` Jeff King
2014-02-28 11:16 ` Brian Gesiak
2014-02-28 13:03 ` Jeff King
2014-02-28 14:57 ` Matthieu Moy
2014-03-01 12:19 ` [PATCH v2] branch: die when " Brian Gesiak
2014-03-01 12:23 ` [PATCH 3/3] " Brian Gesiak
2014-03-01 12:26 ` Brian Gesiak
2014-02-28 7:40 ` [PATCH 1/2] t3200-branch: test " Johannes Sixt
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=1393556659-32717-1-git-send-email-modocache@gmail.com \
--to=modocache@gmail.com \
--cc=git@vger.kernel.org \
/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).