Skip to content

Commit c6ec6da

Browse files
Denton-Lgitster
Denton-L
authored and
gitster
committed
t4014: let sed open its own files
In some cases, we were using a redirection operator to feed input into sed. However, since sed is capable of opening its own files, make sed open its own files instead of redirecting input into it. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f2e2fa8 commit c6ec6da

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

‎t/t4014-format-patch.sh‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ EOF
596596

597597
test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
598598
git format-patch --cover-letter -2 &&
599-
sed -e "1,/A U Thor/d" -e "/^\$/q" <0000-cover-letter.patch >output &&
599+
sed -e "1,/A U Thor/d" -e "/^\$/q" 0000-cover-letter.patch >output &&
600600
test_cmp expect output
601601
'
602602

@@ -635,7 +635,7 @@ EOF
635635

636636
test_expect_success 'format-patch -p suppresses stat' '
637637
git format-patch -p -2 &&
638-
sed -e "1,/^\$/d" -e "/^+5/q" <0001-This-is-an-excessively-long-subject-line-for-a-messa.patch >output &&
638+
sed -e "1,/^\$/d" -e "/^+5/q" 0001-This-is-an-excessively-long-subject-line-for-a-messa.patch >output &&
639639
test_cmp expect output
640640
'
641641

@@ -890,7 +890,7 @@ test_expect_success 'prepare mail-signature input' '
890890
test_expect_success '--signature-file=file works' '
891891
git format-patch --stdout --signature-file=mail-signature -1 >output &&
892892
check_patch output &&
893-
sed -e "1,/^-- \$/d" <output >actual &&
893+
sed -e "1,/^-- \$/d" output >actual &&
894894
{
895895
cat mail-signature && echo
896896
} >expect &&
@@ -901,7 +901,7 @@ test_expect_success 'format.signaturefile works' '
901901
test_config format.signaturefile mail-signature &&
902902
git format-patch --stdout -1 >output &&
903903
check_patch output &&
904-
sed -e "1,/^-- \$/d" <output >actual &&
904+
sed -e "1,/^-- \$/d" output >actual &&
905905
{
906906
cat mail-signature && echo
907907
} >expect &&
@@ -923,7 +923,7 @@ test_expect_success '--signature-file overrides format.signaturefile' '
923923
git format-patch --stdout \
924924
--signature-file=other-mail-signature -1 >output &&
925925
check_patch output &&
926-
sed -e "1,/^-- \$/d" <output >actual &&
926+
sed -e "1,/^-- \$/d" output >actual &&
927927
{
928928
cat other-mail-signature && echo
929929
} >expect &&
@@ -992,7 +992,7 @@ test_expect_success 'format-patch wraps extremely long subject (ascii)' '
992992
git add file &&
993993
git commit -m "$M512" &&
994994
git format-patch --stdout -1 >patch &&
995-
sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject &&
995+
sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
996996
test_cmp expect subject
997997
'
998998

@@ -1031,7 +1031,7 @@ test_expect_success 'format-patch wraps extremely long subject (rfc2047)' '
10311031
git add file &&
10321032
git commit -m "$M512" &&
10331033
git format-patch --stdout -1 >patch &&
1034-
sed -n "/^Subject/p; /^ /p; /^$/q" <patch >subject &&
1034+
sed -n "/^Subject/p; /^ /p; /^$/q" patch >subject &&
10351035
test_cmp expect subject
10361036
'
10371037

@@ -1040,7 +1040,7 @@ check_author() {
10401040
git add file &&
10411041
GIT_AUTHOR_NAME=$1 git commit -m author-check &&
10421042
git format-patch --stdout -1 >patch &&
1043-
sed -n "/^From: /p; /^ /p; /^$/q" <patch >actual &&
1043+
sed -n "/^From: /p; /^ /p; /^$/q" patch >actual &&
10441044
test_cmp expect actual
10451045
}
10461046

@@ -1160,7 +1160,7 @@ test_expect_success '--from=ident replaces author' '
11601160
From: A U Thor <author@example.com>
11611161
11621162
EOF
1163-
sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
1163+
sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
11641164
test_cmp expect patch.head
11651165
'
11661166

@@ -1172,7 +1172,7 @@ test_expect_success '--from uses committer ident' '
11721172
From: A U Thor <author@example.com>
11731173
11741174
EOF
1175-
sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
1175+
sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
11761176
test_cmp expect patch.head
11771177
'
11781178

@@ -1182,7 +1182,7 @@ test_expect_success '--from omits redundant in-body header' '
11821182
From: A U Thor <author@example.com>
11831183
11841184
EOF
1185-
sed -ne "/^From:/p; /^$/p; /^---$/q" <patch >patch.head &&
1185+
sed -ne "/^From:/p; /^$/p; /^---$/q" patch >patch.head &&
11861186
test_cmp expect patch.head
11871187
'
11881188

@@ -1197,7 +1197,7 @@ test_expect_success 'in-body headers trigger content encoding' '
11971197
From: éxötìc <author@example.com>
11981198
11991199
EOF
1200-
sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" <patch >patch.head &&
1200+
sed -ne "/^From:/p; /^$/p; /^Content-Type/p; /^---$/q" patch >patch.head &&
12011201
test_cmp expect patch.head
12021202
'
12031203

@@ -1788,7 +1788,7 @@ test_expect_success 'interdiff: cover-letter' '
17881788
git format-patch --cover-letter --interdiff=boop~2 -1 boop &&
17891789
test_i18ngrep "^Interdiff:$" 0000-cover-letter.patch &&
17901790
test_i18ngrep ! "^Interdiff:$" 0001-fleep.patch &&
1791-
sed "1,/^@@ /d; /^-- $/q" <0000-cover-letter.patch >actual &&
1791+
sed "1,/^@@ /d; /^-- $/q" 0000-cover-letter.patch >actual &&
17921792
test_cmp expect actual
17931793
'
17941794

@@ -1804,7 +1804,7 @@ test_expect_success 'interdiff: solo-patch' '
18041804
EOF
18051805
git format-patch --interdiff=boop~2 -1 boop &&
18061806
test_i18ngrep "^Interdiff:$" 0001-fleep.patch &&
1807-
sed "1,/^ @@ /d; /^$/q" <0001-fleep.patch >actual &&
1807+
sed "1,/^ @@ /d; /^$/q" 0001-fleep.patch >actual &&
18081808
test_cmp expect actual
18091809
'
18101810

0 commit comments

Comments
 (0)