--- t/t6046-merge-skip-unneeded-updates.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/t/t6046-merge-skip-unneeded-updates.sh b/t/t6046-merge-skip-unneeded-updates.sh index 880cd782d7..fcefffcaec 100755 --- a/t/t6046-merge-skip-unneeded-updates.sh +++ b/t/t6046-merge-skip-unneeded-updates.sh @@ -41,7 +41,7 @@ test_expect_success '1a-setup: Modify(A)/Modify(B), change on B subset of A' ' ( cd 1a && - test_write_lines 1 2 3 4 5 6 7 8 9 10 >b + test_write_lines 1 2 3 4 5 6 7 8 9 10 >b && git add b && test_tick && git commit -m "O" && @@ -138,7 +138,7 @@ test_expect_success '2a-setup: Modify(A)/rename(B)' ' ( cd 2a && - test_seq 1 10 >b + test_seq 1 10 >b && git add b && test_tick && git commit -m "O" && @@ -148,7 +148,7 @@ test_expect_success '2a-setup: Modify(A)/rename(B)' ' git branch B && git checkout A && - test_seq 1 11 > b && + test_seq 1 11 >b && git add b && test_tick && git commit -m "A" && @@ -229,7 +229,7 @@ test_expect_success '2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A' ' ( cd 2b && - test_write_lines 1 2 3 4 5 6 7 8 9 10 >b + test_write_lines 1 2 3 4 5 6 7 8 9 10 >b && git add b && test_tick && git commit -m "O" && @@ -337,7 +337,7 @@ test_expect_success '2c-setup: Modify b & add c VS rename b->c' ' ( cd 2c && - test_seq 1 10 >b + test_seq 1 10 >b && git add b && test_tick && git commit -m "O" && @@ -443,7 +443,7 @@ test_expect_success '3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' git branch B && git checkout A && - test_seq 1 11 > bq && + test_seq 1 11 >bq && git add bq && git mv bq foo/ && test_tick && @@ -542,7 +542,7 @@ test_expect_success '3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' ' git commit -m "A" && git checkout B && - test_seq 1 11 > bq && + test_seq 1 11 >bq && git add bq && git mv foo/ bar/ && test_tick && @@ -624,7 +624,7 @@ test_expect_success '4a-setup: Change on A, change on B subset of A, dirty mods ( cd 4a && - test_write_lines 1 2 3 4 5 6 7 8 9 10 >b + test_write_lines 1 2 3 4 5 6 7 8 9 10 >b && git add b && test_tick && git commit -m "O" && @@ -698,7 +698,7 @@ test_expect_success '4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, di ( cd 4b && - test_write_lines 1 2 3 4 5 6 7 8 9 10 >b + test_write_lines 1 2 3 4 5 6 7 8 9 10 >b && git add b && test_tick && git commit -m "O" && -- 2.17.0.295.g791b7256b2.dirty
