From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: no-xmailer tests fail under Mac OS Date: Thu, 11 Dec 2014 17:13:39 -0500 Message-ID: <20141211221339.GA9478@peff.net> References: <20141206053434.GF31301@peff.net> <20141206063245.GA5966@peff.net> <20141206071234.GA6850@peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Michael Blume , Git List , Luis Henriques To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Dec 11 23:13:51 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XzBzZ-00042p-EC for gcvg-git-2@plane.gmane.org; Thu, 11 Dec 2014 23:13:49 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934490AbaLKWNm (ORCPT ); Thu, 11 Dec 2014 17:13:42 -0500 Received: from cloud.peff.net ([50.56.180.127]:51871 "HELO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S933877AbaLKWNm (ORCPT ); Thu, 11 Dec 2014 17:13:42 -0500 Received: (qmail 26008 invoked by uid 102); 11 Dec 2014 22:13:41 -0000 Received: from Unknown (HELO peff.net) (10.0.1.1) by cloud.peff.net (qpsmtpd/0.84) with SMTP; Thu, 11 Dec 2014 16:13:41 -0600 Received: (qmail 6187 invoked by uid 107); 11 Dec 2014 22:13:47 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) by peff.net (qpsmtpd/0.84) with SMTP; Thu, 11 Dec 2014 17:13:47 -0500 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Thu, 11 Dec 2014 17:13:39 -0500 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Thu, Dec 11, 2014 at 02:11:04PM -0800, Junio C Hamano wrote: > Jeff King 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(-) > [...] Yeah, looks good to me. -Peff