X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=t%2Ft3201-branch-contains.sh;h=f86f4bc5ebcc0e36ddb4071a6aeb855e1039faa6;hb=196821f440d46029f0399a7d97c0cfc78a870244;hp=b4cf628d225d380d6c0bf73dee4c3e9df0cadb41;hpb=4c414e2e09607d53141573710ef6d79db2aa64ae;p=~andy%2Fgit

diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index b4cf628d2..f86f4bc5e 100755
--- a/t/t3201-branch-contains.sh
+++ b/t/t3201-branch-contains.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='branch --contains <commit>'
+test_description='branch --contains <commit>, --merged, and --no-merged'
 
 . ./test-lib.sh
 
@@ -55,4 +55,44 @@ test_expect_success 'branch --contains=side' '
 
 '
 
+test_expect_success 'side: branch --merged' '
+
+	git branch --merged >actual &&
+	{
+		echo "  master" &&
+		echo "* side"
+	} >expect &&
+	test_cmp expect actual
+
+'
+
+test_expect_success 'side: branch --no-merged' '
+
+	git branch --no-merged >actual &&
+	>expect &&
+	test_cmp expect actual
+
+'
+
+test_expect_success 'master: branch --merged' '
+
+	git checkout master &&
+	git branch --merged >actual &&
+	{
+		echo "* master"
+	} >expect &&
+	test_cmp expect actual
+
+'
+
+test_expect_success 'master: branch --no-merged' '
+
+	git branch --no-merged >actual &&
+	{
+		echo "  side"
+	} >expect &&
+	test_cmp expect actual
+
+'
+
 test_done