mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
87ed97167a
commit
3871bdb7e4
|
@ -176,7 +176,7 @@ test_expect_success 'directory rename + content conflict' '
|
||||||
|
|
||||||
test_expect_code 1 \
|
test_expect_code 1 \
|
||||||
git merge-tree -z A^0 B^0 >out &&
|
git merge-tree -z A^0 B^0 >out &&
|
||||||
printf "\\n" >>out &&
|
echo >>out &&
|
||||||
anonymize_hash out >actual &&
|
anonymize_hash out >actual &&
|
||||||
q_to_tab <<-\EOF | lf_to_nul >expect &&
|
q_to_tab <<-\EOF | lf_to_nul >expect &&
|
||||||
HASH
|
HASH
|
||||||
|
@ -230,7 +230,7 @@ test_expect_success 'rename/delete handling' '
|
||||||
|
|
||||||
test_expect_code 1 \
|
test_expect_code 1 \
|
||||||
git merge-tree -z A^0 B^0 >out &&
|
git merge-tree -z A^0 B^0 >out &&
|
||||||
printf "\\n" >>out &&
|
echo >>out &&
|
||||||
anonymize_hash out >actual &&
|
anonymize_hash out >actual &&
|
||||||
q_to_tab <<-\EOF | lf_to_nul >expect &&
|
q_to_tab <<-\EOF | lf_to_nul >expect &&
|
||||||
HASH
|
HASH
|
||||||
|
@ -284,7 +284,7 @@ test_expect_success 'rename/add handling' '
|
||||||
|
|
||||||
test_expect_code 1 \
|
test_expect_code 1 \
|
||||||
git merge-tree -z A^0 B^0 >out &&
|
git merge-tree -z A^0 B^0 >out &&
|
||||||
printf "\\n" >>out &&
|
echo >>out &&
|
||||||
|
|
||||||
#
|
#
|
||||||
# First, check that the bar that appears at stage 3 does not
|
# 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' '
|
||||||
|
|
||||||
test_expect_code 1 \
|
test_expect_code 1 \
|
||||||
git merge-tree -z A^0 B^0 >out &&
|
git merge-tree -z A^0 B^0 >out &&
|
||||||
printf "\\n" >>out &&
|
echo >>out &&
|
||||||
|
|
||||||
#
|
#
|
||||||
# First, check that the bar that appears at stage 3 does not
|
# First, check that the bar that appears at stage 3 does not
|
||||||
|
@ -417,7 +417,7 @@ test_expect_success 'rename/rename + content conflict' '
|
||||||
|
|
||||||
test_expect_code 1 \
|
test_expect_code 1 \
|
||||||
git merge-tree -z A^0 B^0 >out &&
|
git merge-tree -z A^0 B^0 >out &&
|
||||||
printf "\\n" >>out &&
|
echo >>out &&
|
||||||
anonymize_hash out >actual &&
|
anonymize_hash out >actual &&
|
||||||
q_to_tab <<-\EOF | lf_to_nul >expect &&
|
q_to_tab <<-\EOF | lf_to_nul >expect &&
|
||||||
HASH
|
HASH
|
||||||
|
@ -471,7 +471,7 @@ test_expect_success 'rename/add/delete conflict' '
|
||||||
|
|
||||||
test_expect_code 1 \
|
test_expect_code 1 \
|
||||||
git merge-tree -z B^0 A^0 >out &&
|
git merge-tree -z B^0 A^0 >out &&
|
||||||
printf "\\n" >>out &&
|
echo >>out &&
|
||||||
anonymize_hash out >actual &&
|
anonymize_hash out >actual &&
|
||||||
|
|
||||||
q_to_tab <<-\EOF | lf_to_nul >expect &&
|
q_to_tab <<-\EOF | lf_to_nul >expect &&
|
||||||
|
@ -528,7 +528,7 @@ test_expect_success 'rename/rename(2to1)/delete/delete conflict' '
|
||||||
|
|
||||||
test_expect_code 1 \
|
test_expect_code 1 \
|
||||||
git merge-tree -z A^0 B^0 >out &&
|
git merge-tree -z A^0 B^0 >out &&
|
||||||
printf "\\n" >>out &&
|
echo >>out &&
|
||||||
anonymize_hash out >actual &&
|
anonymize_hash out >actual &&
|
||||||
|
|
||||||
q_to_tab <<-\EOF | lf_to_nul >expect &&
|
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
|
||||||
|
|
||||||
test_expect_code 1 \
|
test_expect_code 1 \
|
||||||
git merge-tree -z A^0 B^0 >out &&
|
git merge-tree -z A^0 B^0 >out &&
|
||||||
printf "\\n" >>out &&
|
echo >>out &&
|
||||||
|
|
||||||
#
|
#
|
||||||
# First, check that some of the hashes that appear as stage
|
# 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
|
||||||
|
|
||||||
test_expect_code 1 \
|
test_expect_code 1 \
|
||||||
git merge-tree -z A^0 B^0 >out &&
|
git merge-tree -z A^0 B^0 >out &&
|
||||||
printf "\\n" >>out &&
|
echo >>out &&
|
||||||
anonymize_hash out >actual &&
|
anonymize_hash out >actual &&
|
||||||
|
|
||||||
q_to_tab <<-\EOF | lf_to_nul >expect &&
|
q_to_tab <<-\EOF | lf_to_nul >expect &&
|
||||||
|
@ -760,7 +760,7 @@ test_expect_success 'NUL terminated conflicted file "lines"' '
|
||||||
git commit -m "Renamed numbers" &&
|
git commit -m "Renamed numbers" &&
|
||||||
|
|
||||||
test_expect_code 1 git merge-tree --write-tree -z tweak1 side2 >out &&
|
test_expect_code 1 git merge-tree --write-tree -z tweak1 side2 >out &&
|
||||||
printf "\\n" >>out &&
|
echo >>out &&
|
||||||
anonymize_hash out >actual &&
|
anonymize_hash out >actual &&
|
||||||
|
|
||||||
# Expected results:
|
# Expected results:
|
||||||
|
|
Loading…
Reference in a new issue