From: Brian Gesiak <modocache@gmail.com>
Date: Wed, 5 Mar 2014 07:31:55 +0000 (+0900)
Subject: t3200-branch: test setting branch as own upstream
X-Git-Tag: v2.0.0-rc0~88^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95052d1f2db7103b4ff8d44591fc614419ae6eb2;p=thirdparty%2Fgit.git

t3200-branch: test setting branch as own upstream

No test asserts that "git branch -u refs/heads/my-branch my-branch"
avoids leaving nonsense configuration and emits a warning.

Add a test that does so.

Signed-off-by: Brian Gesiak <modocache@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index fcdb867748..83037b1cd9 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 notices an error 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_expect_code 1 git config branch.my13.remote &&
+	test_expect_code 1 git config branch.my13.merge &&
+	test_i18ncmp 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