From 982b64e4ccc993e51a7e7a1e1713953ecf95e4f2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 28 Jun 2006 22:48:34 -0700 Subject: [PATCH] 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 --- t/t4014-format-patch.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" ' -- 2.26.2