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>
This commit is contained in:
Junio C Hamano 2006-06-28 22:48:34 -07:00
Родитель 81db094107
Коммит 982b64e4cc
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -21,15 +21,15 @@ test_expect_success setup '
for i in D E F; do echo "$i"; done >>file && for i in D E F; do echo "$i"; done >>file &&
git update-index file && git update-index file &&
git commit -m "Side change #2" && 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 && 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 update-index file &&
git commit -m "Side change #3" && git commit -m "Side change #3" &&
git checkout master && git checkout master &&
git diff-tree -p C1 | git apply --index && git diff-tree -p C2 | git apply --index &&
git commit -m "Master accepts moral equivalent of #1" git commit -m "Master accepts moral equivalent of #2"
' '