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>
Junio C Hamano committed
Jun 28, 2006 at 22:48 UTC
982b64e4ccc993e51a7e7a1e1713953ecf95e4f2
1 file changed
+3
-3
t/t4014-format-patch.sh
+3
-3
@@ -21,15 +21,15 @@ test_expect_success setup '
21
for i in D E F; do echo "$i"; done >>file &&
22
git update-index file &&
23
git commit -m "Side change #2" &&
24
- git tag C1 &&
24
+ git tag C2 &&
25
26
for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
27
git update-index file &&
28
git commit -m "Side change #3" &&
29
30
git checkout master &&
31
- git diff-tree -p C1 | git apply --index &&
32
- git commit -m "Master accepts moral equivalent of #1"
31
+ git diff-tree -p C2 | git apply --index &&
32
+ git commit -m "Master accepts moral equivalent of #2"
33
34
'
35