From: Junio C Hamano <junkio@cox.net>
Date: Thu, 29 Jun 2006 05:48:34 +0000 (-0700)
Subject: t4014: fix test commit labels.
X-Git-Tag: v1.4.1~12^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=982b64e4ccc993e51a7e7a1e1713953ecf95e4f2;p=git.git

t4014: fix test commit labels.

The commit tag and commit comments used in the test claimed that
the #1 commit was merged upstream where the test actually let the
upstream merge #2 commit.  Fix them.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index ac2fde773..4795872a7 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -21,15 +21,15 @@ test_expect_success setup '
 	for i in D E F; do echo "$i"; done >>file &&
 	git update-index file &&
 	git commit -m "Side change #2" &&
-	git tag C1 &&
+	git tag C2 &&
 
 	for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
 	git update-index file &&
 	git commit -m "Side change #3" &&
 
 	git checkout master &&
-	git diff-tree -p C1 | git apply --index &&
-	git commit -m "Master accepts moral equivalent of #1"
+	git diff-tree -p C2 | git apply --index &&
+	git commit -m "Master accepts moral equivalent of #2"
 
 '