git-branch --contains: doc and test

Signed-off-by: Junio C Hamano <gitster@pobox.com>

1 files changed, 58 insertions, 0 deletions

diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
new file mode 100755
index 000000000..9ef593f0e
--- /dev/null
+++ b/t/t3201-branch-contains.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+test_description='branch --contains <commit>'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+
+	>file &&
+	git add file &&
+	test_tick &&
+	git commit -m initial &&
+	git branch side &&
+
+	echo 1 >file &&
+	test_tick &&
+	git commit -a -m "second on master" &&
+
+	git checkout side &&
+	echo 1 >file &&
+	test_tick &&
+	git commit -a -m "second on side" &&
+
+	git merge master
+
+'
+
+test_expect_success 'branch --contains=master' '
+
+	git branch --contains=master >actual &&
+	{
+		echo "  master" && echo "* side"
+	} >expect &&
+	diff -u expect actual
+
+'
+
+test_expect_success 'branch --contains master' '
+
+	git branch --contains master >actual &&
+	{
+		echo "  master" && echo "* side"
+	} >expect &&
+	diff -u expect actual
+
+'
+
+test_expect_success 'branch --contains=side' '
+
+	git branch --contains=side >actual &&
+	{
+		echo "* side"
+	} >expect &&
+	diff -u expect actual
+
+'
+
+test_done