Skip to content

Commit d4cf11c

Browse files
Awaryngitster
authored andcommitted
t9001-send-email: refactor header variable fields replacement
Create a function which replaces Date, Message-Id and X-Mailer lines generated by git-send-email by a specific string: Date:.*$ -> Date: DATE-STRING Message-Id:.*$ -> Message-Id: MESSAGE-ID-STRING X-Mailer:.*$ -> X-Mailer: X-MAILER-STRING Signed-off-by: Remi Lespinet <[email protected]> Signed-off-by: Matthieu Moy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f6f79e5 commit d4cf11c

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

t/t9001-send-email.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -522,17 +522,20 @@ Result: OK
522522
EOF
523523
"
524524

525+
replace_variable_fields () {
526+
sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \
527+
-e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
528+
-e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/"
529+
}
530+
525531
test_suppression () {
526532
git send-email \
527533
--dry-run \
528534
--suppress-cc=$1 ${2+"--suppress-cc=$2"} \
529535
--from="Example <[email protected]>" \
530536
531537
--smtp-server relay.example.com \
532-
$patches |
533-
sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \
534-
-e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
535-
-e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/" \
538+
$patches | replace_variable_fields \
536539
>actual-suppress-$1${2+"-$2"} &&
537540
test_cmp expected-suppress-$1${2+"-$2"} actual-suppress-$1${2+"-$2"}
538541
}

0 commit comments

Comments
 (0)