diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-28 22:48:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-28 22:48:34 -0700 |
| commit | 982b64e4ccc993e51a7e7a1e1713953ecf95e4f2 (patch) | |
| tree | 2a595fa20e67410cc98538aef0bf9852dd91d0f5 | |
| parent | format-patch: use clear_commit_marks() instead of some ad-hockery (diff) | |
| download | tgif-982b64e4ccc993e51a7e7a1e1713953ecf95e4f2.tar.xz | |
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>
| -rwxr-xr-x | t/t4014-format-patch.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index ac2fde773d..4795872a77 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" ' |