t4301: emit blank line in more idiomatic fashion
The unusual use of: printf "\\n" >>file && may give readers pause, making them wonder why this form was chosen over the more typical: printf "\n" >>file && However, even that may give pause since it is a somewhat unusual and long-winded way of saying: echo >>file && Therefore, replace `printf` with the more idiomatic `echo`, with the hope of eliminating a possible stumbling block for those reading the code. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
Aug 28, 2022 at 05:17 UTC
3871bdb7e40cc9a91d2cce58e2f5c49313521dc4
1 file changed
+10
-10
t/t4301-merge-tree-write-tree.sh
+10
-10
@@ -176,7 +176,7 @@ test_expect_success 'directory rename + content conflict' '
176
177
test_expect_code 1 \
178
git merge-tree -z A^0 B^0 >out &&
179
- printf "\\n" >>out &&
179
+ echo >>out &&
180
anonymize_hash out >actual &&
181
q_to_tab <<-\EOF | lf_to_nul >expect &&
182
HASH
@@ -230,7 +230,7 @@ test_expect_success 'rename/delete handling' '
230
231
test_expect_code 1 \
232
git merge-tree -z A^0 B^0 >out &&
233
- printf "\\n" >>out &&
233
+ echo >>out &&
234
anonymize_hash out >actual &&
235
q_to_tab <<-\EOF | lf_to_nul >expect &&
236
HASH
@@ -284,7 +284,7 @@ test_expect_success 'rename/add handling' '
284
285
test_expect_code 1 \
286
git merge-tree -z A^0 B^0 >out &&
287
- printf "\\n" >>out &&
287
+ echo >>out &&
288
289
#
290
# First, check that the bar that appears at stage 3 does not
@@ -351,7 +351,7 @@ test_expect_success SYMLINKS 'rename/add, where add is a mode conflict' '
351
352
test_expect_code 1 \
353
git merge-tree -z A^0 B^0 >out &&
354
- printf "\\n" >>out &&
354
+ echo >>out &&
355
356
#
357
# First, check that the bar that appears at stage 3 does not
@@ -417,7 +417,7 @@ test_expect_success 'rename/rename + content conflict' '
417
418
test_expect_code 1 \
419
git merge-tree -z A^0 B^0 >out &&
420
- printf "\\n" >>out &&
420
+ echo >>out &&
421
anonymize_hash out >actual &&
422
q_to_tab <<-\EOF | lf_to_nul >expect &&
423
HASH
@@ -471,7 +471,7 @@ test_expect_success 'rename/add/delete conflict' '
471
472
test_expect_code 1 \
473
git merge-tree -z B^0 A^0 >out &&
474
- printf "\\n" >>out &&
474
+ echo >>out &&
475
anonymize_hash out >actual &&
476
477
q_to_tab <<-\EOF | lf_to_nul >expect &&
@@ -528,7 +528,7 @@ test_expect_success 'rename/rename(2to1)/delete/delete conflict' '
528
529
test_expect_code 1 \
530
git merge-tree -z A^0 B^0 >out &&
531
- printf "\\n" >>out &&
531
+ echo >>out &&
532
anonymize_hash out >actual &&
533
534
q_to_tab <<-\EOF | lf_to_nul >expect &&
@@ -600,7 +600,7 @@ test_expect_success 'mod6: chains of rename/rename(1to2) and add/add via collidi
600
601
test_expect_code 1 \
602
git merge-tree -z A^0 B^0 >out &&
603
- printf "\\n" >>out &&
603
+ echo >>out &&
604
605
#
606
# First, check that some of the hashes that appear as stage
@@ -690,7 +690,7 @@ test_expect_success 'directory rename + rename/delete + modify/delete + director
690
691
test_expect_code 1 \
692
git merge-tree -z A^0 B^0 >out &&
693
- printf "\\n" >>out &&
693
+ echo >>out &&
694
anonymize_hash out >actual &&
695
696
q_to_tab <<-\EOF | lf_to_nul >expect &&
@@ -760,7 +760,7 @@ test_expect_success 'NUL terminated conflicted file "lines"' '
760
git commit -m "Renamed numbers" &&
761
762
test_expect_code 1 git merge-tree --write-tree -z tweak1 side2 >out &&
763
- printf "\\n" >>out &&
763
+ echo >>out &&
764
anonymize_hash out >actual &&
765
766
# Expected results: