All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brian Gesiak <modocache@gmail.com>
To: git@vger.kernel.org
Cc: Brian Gesiak <modocache@gmail.com>
Subject: [PATCH] t3200-branch: test setting branch as own upstream
Date: Wed,  5 Mar 2014 16:31:55 +0900	[thread overview]
Message-ID: <1394004715-18776-1-git-send-email-modocache@gmail.com> (raw)
In-Reply-To: <xmqqmwh5ikl0.fsf@gitster.dls.corp.google.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 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index fcdb867..e6d4015 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -507,6 +507,16 @@ 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_i18ncmp expected actual &&
+	test_must_fail git config branch.my13.remote &&
+	test_must_fail git config branch.my13.merge
+'
+
 # 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)

  reply	other threads:[~2014-03-05  7:32 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-28  6:41 [PATCH v2 1/2] t3200-branch: test setting branch as own upstream Brian Gesiak
2014-03-04 23:56 ` Junio C Hamano
2014-03-05  7:31   ` Brian Gesiak [this message]
2014-03-06 21:00     ` [PATCH] " Jeff King
2014-03-06 21:53       ` Junio C Hamano

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=1394004715-18776-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.