diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2021-12-09 06:11:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-13 19:29:48 +0100 |
| commit | 0849541268a3aca9381591aed87b6864a203709b (patch) | |
| tree | 00aa5e565425fd234928d17ad17e91c521d01d38 /t/t6417-merge-ours-theirs.sh | |
| parent | tests: simplify construction of large blocks of text (diff) | |
| download | git-0849541268a3aca9381591aed87b6864a203709b.tar.xz git-0849541268a3aca9381591aed87b6864a203709b.zip | |
tests: use test_write_lines() to generate line-oriented output
Take advantage of test_write_lines() to generate line-oriented output
rather than using for-loops or a series of `echo` commands. Not only is
test_write_lines() a natural fit for such a task, but there is less
opportunity for a broken &&-chain.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6417-merge-ours-theirs.sh')
| -rwxr-xr-x | t/t6417-merge-ours-theirs.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/t/t6417-merge-ours-theirs.sh b/t/t6417-merge-ours-theirs.sh index ec065d6a65..62d1406119 100755 --- a/t/t6417-merge-ours-theirs.sh +++ b/t/t6417-merge-ours-theirs.sh @@ -7,10 +7,7 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh test_expect_success setup ' - for i in 1 2 3 4 5 6 7 8 9 - do - echo "$i" - done >file && + test_write_lines 1 2 3 4 5 6 7 8 9 >file && git add file && cp file elif && git commit -m initial && |