diff options
author | Ramkumar Ramachandra <artagnon@gmail.com> | 2010-08-28 01:58:15 +0530 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-08-27 16:47:42 -0700 |
commit | 6426f2d2afb42e51dac901ff666c3296424c6f5c (patch) | |
tree | 0983f7531a5287c8e8ffac9e2ac0fc9c21d2537f /t/t4014-format-patch.sh | |
parent | d599e0484f8ebac8cc50e9557a4c3d246826843d (diff) | |
download | git-6426f2d2afb42e51dac901ff666c3296424c6f5c.tar.gz |
t4014-format-patch: Call test_tick before committing
Call test_tick before attempting to commit in the setup routine to
preserve the order of the commits.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4014-format-patch.sh')
-rwxr-xr-x | t/t4014-format-patch.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index d21c37f3a2..6321ac88aa 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -12,24 +12,29 @@ test_expect_success setup ' for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file && cat file >elif && git add file elif && + test_tick && git commit -m Initial && git checkout -b side && for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file && test_chmod +x elif && + test_tick && git commit -m "Side changes #1" && for i in D E F; do echo "$i"; done >>file && git update-index file && + test_tick && git commit -m "Side changes #2" && 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 && + test_tick && git commit -m "Side changes #3 with \\n backslash-n in it." && git checkout master && git diff-tree -p C2 | git apply --index && + test_tick && git commit -m "Master accepts moral equivalent of #2" ' |