X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6040-tracking-info.sh;h=19de5b16eb530d428f66e5161a3ab48fce34049d;hb=ac86ec0f5e2dbd0d46fb000db1a65f1d2173a02d;hp=a9b0ac1efc0eac3f50bd9fe26e5900307eddaba2;hpb=be653d6cb87d17c1d70d31cb7cfcb004d48def7b;p=git.git

diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index a9b0ac1ef..19de5b16e 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -110,4 +110,18 @@ test_expect_success '--set-upstream does not change branch' '
 	grep -q "^refs/heads/master$" actual &&
 	cmp expect2 actual2
 '
+
+test_expect_success '--set-upstream @{-1}' '
+	git checkout from-master &&
+	git checkout from-master2 &&
+	git config branch.from-master2.merge > expect2 &&
+	git branch --set-upstream @{-1} follower &&
+	git config branch.from-master.merge > actual &&
+	git config branch.from-master2.merge > actual2 &&
+	git branch --set-upstream from-master follower &&
+	git config branch.from-master.merge > expect &&
+	test_cmp expect2 actual2 &&
+	test_cmp expect actual
+'
+
 test_done