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>
Ramkumar Ramachandra committed
Aug 28, 2010 at 01:58 UTC
6426f2d2afb42e51dac901ff666c3296424c6f5c
1 file changed
+5
t/t4014-format-patch.sh
+5
@@ -12,24 +12,29 @@ test_expect_success setup '
12
for i in 1 2 3 4 5 6 7 8 9 10; do echo "$i"; done >file &&
13
cat file >elif &&
14
git add file elif &&
15
+ test_tick &&
16
git commit -m Initial &&
17
git checkout -b side &&
18
19
for i in 1 2 5 6 A B C 7 8 9 10; do echo "$i"; done >file &&
20
test_chmod +x elif &&
21
+ test_tick &&
22
git commit -m "Side changes #1" &&
23
24
for i in D E F; do echo "$i"; done >>file &&
25
git update-index file &&
26
+ test_tick &&
27
git commit -m "Side changes #2" &&
28
git tag C2 &&
29
30
for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >file &&
31
git update-index file &&
32
+ test_tick &&
33
git commit -m "Side changes #3 with \\n backslash-n in it." &&
34
35
git checkout master &&
36
git diff-tree -p C2 | git apply --index &&
37
+ test_tick &&
38
git commit -m "Master accepts moral equivalent of #2"
39
40
'