Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'

gitster · gitster · commit 08d2f46d0caf · 2019-12-10T13:11:45.000-08:00
Test portability fix.

* bc/t9001-zsh-in-posix-emulation-mode:
  t9001: avoid including non-trailing NUL bytes in variables
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
@@ -2066,7 +2066,7 @@ test_expect_success $PREREQ 'leading and trailing whitespaces are removed' '
 	TO1=$(echo "QTo 1 <to1@example.com>" | q_to_tab) &&
 	TO2=$(echo "QZto2" | qz_to_tab_space) &&
 	CC1=$(echo "cc1" | append_cr) &&
-	BCC1=$(echo "Q bcc1@example.com Q" | q_to_nul) &&
+	BCC1=$(echo " bcc1@example.com Q" | q_to_nul) &&
 	git send-email \
 	--dry-run \
 	--from="	Example <from@example.com>" \

-Original file line number
+Diff line change
 	TO1=$(echo "QTo 1 <[email protected]>" | q_to_tab) &&
 	TO2=$(echo "QZto2" | qz_to_tab_space) &&
 	CC1=$(echo "cc1" | append_cr) &&
 -	BCC1=$(echo "Q [email protected] Q" | q_to_nul) &&
 +	BCC1=$(echo " [email protected] Q" | q_to_nul) &&
 	git send-email \
 	--dry-run \
 	--from="	Example <[email protected]>" \