From mboxrd@z Thu Jan  1 00:00:00 1970
From: Johan Herland <johan@herland.net>
Subject: Re: [PATCHv3 5/8] Teach "-m <msg>" and "-F <file>" to "git notes edit"
Date: Thu, 30 Jul 2009 03:02:48 +0200
Message-ID: <200907300302.48337.johan@herland.net>
References: <1248834326-31488-1-git-send-email-johan@herland.net>
 <1248834326-31488-6-git-send-email-johan@herland.net>
 <200907290957.36000.trast@student.ethz.ch>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-8859-15
Content-Transfer-Encoding: 7BIT
Cc: git@vger.kernel.org, gitster@pobox.com, johannes.schindelin@gmx.de,
	tavestbo@trolltech.com, git@drmicha.warpmail.net,
	chriscool@tuxfamily.org, spearce@spearce.org
To: Thomas Rast <trast@student.ethz.ch>
X-From: git-owner@vger.kernel.org Thu Jul 30 03:02:58 2009
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@gmane.org
Received: from vger.kernel.org ([209.132.176.167])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1MWK2r-000272-PH
	for gcvg-git-2@gmane.org; Thu, 30 Jul 2009 03:02:58 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756059AbZG3BCu (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Wed, 29 Jul 2009 21:02:50 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756055AbZG3BCu
	(ORCPT <rfc822;git-outgoing>); Wed, 29 Jul 2009 21:02:50 -0400
Received: from mx.getmail.no ([84.208.15.66]:60652 "EHLO
	get-mta-out01.get.basefarm.net" rhost-flags-OK-OK-OK-FAIL)
	by vger.kernel.org with ESMTP id S1756053AbZG3BCt (ORCPT
	<rfc822;git@vger.kernel.org>); Wed, 29 Jul 2009 21:02:49 -0400
Content-disposition: inline
Received: from mx.getmail.no ([10.5.16.4]) by get-mta-out01.get.basefarm.net
 (Sun Java(tm) System Messaging Server 7.0-0.04 64bit (built Jun 20 2008))
 with ESMTP id <0KNK008UALKPA4B0@get-mta-out01.get.basefarm.net> for
 git@vger.kernel.org; Thu, 30 Jul 2009 03:02:49 +0200 (MEST)
Received: from alpha.localnet ([84.215.102.95])
 by get-mta-in03.get.basefarm.net
 (Sun Java(tm) System Messaging Server 7.0-0.04 64bit (built Jun 20 2008))
 with ESMTP id <0KNK00DHULKO4620@get-mta-in03.get.basefarm.net> for
 git@vger.kernel.org; Thu, 30 Jul 2009 03:02:49 +0200 (MEST)
X-PMX-Version: 5.5.5.374460, Antispam-Engine: 2.7.1.369594,
 Antispam-Data: 2009.7.30.5116
User-Agent: KMail/1.11.4 (Linux/2.6.30-ARCH; KDE/4.2.4; x86_64; ; )
In-reply-to: <200907290957.36000.trast@student.ethz.ch>
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/124431>

On Wednesday 29 July 2009, Thomas Rast wrote:
> Johan Herland wrote:
> > diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
>
> [...]
>
> > +cat > expect-m-and-F << EOF
> > +commit 15023535574ded8b1a89052b32673f84cf9582b8
> > +Author: A U Thor <author@example.com>
> > +Date:   Thu Apr 7 15:16:13 2005 -0700
> > +
> > +    4th
> > +
> > +Notes:
> > +    spam
> > +
> > +    xyzzy
> > +
> > +    foo
>
> There's significant trailing whitespace here (in the lines between
> spam, xyzzy and foo) that initially broke the test for me because I
> use apply.whitespace=fix.  Can you guard the whitespace if it is
> really important, with something like
>
> sed 's/#$//' > expect <<EOF
> whitespace:    #
> EOF

Thanks! Will be fixed in the next iteration of this topic.


...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net