Jeff King <p...@peff.net> writes:
> On Fri, Dec 05, 2014 at 11:07:37PM -0800, Michael Blume wrote:
>
>> > Ah, right, we might be looking for 0 sometimes. The right way to do it
>> > without destroying the &&-chaining is:
>> >
>> > { grep ^X-Mailer: out || true } &&
>> > test_line_count = $expected mailer
>>
>> Hmm, it doesn't look like that helper is &&-chained though? So it
>> seems like we could just do without the &&
>
> You're right, but that is IMHO a bug. We would not notice if send-email
> or format-patch barfed, and we are expecting to find no X-Mailer (we
> wouldn't, but for the wrong reason).
Let me patch this up further by amending the SQUASH??? at the tip.
t/t9001-send-email.sh | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index bb573ef..7826aa8 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1408,18 +1408,17 @@ test_expect_success $PREREQ
'sendemail.aliasfile=~/.mailrc' '
'
do_xmailer_test() {
- expected=$1
- params=$2
- git format-patch -1
+ expected=$1 params=$2 &&
+ git format-patch -1 &&
git send-email \
--from="Example <nob...@example.com>" \
--to=some...@example.com \
--smtp-server="$(pwd)/fake.sendmail" \
$params \
0001-*.patch \
- 2>errors >out
- test "z$(grep ^X-Mailer: out | wc -l)" = "z$expected"
- return $?
+ 2>errors >out &&
+ { grep '^X-Mailer:' out || :; } >mailer &&
+ test_line_count = $expected mailer
}
test_expect_success $PREREQ '--[no-]xmailer without any configuration' '
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
