X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6040-tracking-info.sh;h=1785e178a4cb8fddd58d1b1db8062cf12825155e;hb=be8198b236e2eeaf08618185f4f7ad83896bb704;hp=664b0f805288863955d8b6389c95f0f8f542f136;hpb=b3ce9a0874cc7ec1d0fd5ead97d78a428d1fdd75;p=git.git

diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 664b0f805..1785e178a 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -89,4 +89,25 @@ test_expect_success 'status when tracking annotated tags' '
 	grep "set up to track" actual &&
 	git checkout heavytrack
 '
+
+test_expect_success 'setup tracking with branch --set-upstream on existing branch' '
+	git branch from-master master &&
+	test_must_fail git config branch.from-master.merge > actual &&
+	git branch --set-upstream from-master master &&
+	git config branch.from-master.merge > actual &&
+	grep -q "^refs/heads/master$" actual
+'
+
+test_expect_success '--set-upstream does not change branch' '
+	git branch from-master2 master &&
+	test_must_fail git config branch.from-master2.merge > actual &&
+	git rev-list from-master2 &&
+	git update-ref refs/heads/from-master2 from-master2^ &&
+	git rev-parse from-master2 >expect2 &&
+	git branch --set-upstream from-master2 master &&
+	git config branch.from-master.merge > actual &&
+	git rev-parse from-master2 >actual2 &&
+	grep -q "^refs/heads/master$" actual &&
+	cmp expect2 actual2
+'
 test_done