Skip to content

Commit

Permalink
t4014: fix test commit labels.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Jun 29, 2006
1 parent 81db094 commit 982b64e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions t/t4014-format-patch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
'

Expand Down

0 comments on commit 982b64e

Please sign in to comment.