From: Santi Béjar Date: Fri, 16 Apr 2010 17:59:32 GMT Subject: Re: [PATCH 2/2] Fix t4013 with commit date in mbox 'From COMMIT DATE' header lines Message-ID: In-Reply-To: <2b1d2ec748f3a28e7210f235df29703fd425e08a.1271436192.git.chris@arachsys.com> It is better if you squash this patch into the earlier one, then the tests always pass. Santi On Fri, Apr 16, 2010 at 6:42 PM, Chris Webb wrote: > Signed-off-by: Chris Webb > --- >  t/t4013-diff-various.sh |    3 ++- >  1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh > index dae6358..ce42d3f 100755 > --- a/t/t4013-diff-various.sh > +++ b/t/t4013-diff-various.sh > @@ -110,7 +110,8 @@ do >                        echo "\$ git $cmd" >                        git $cmd | >                        sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \ > -                           -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/" > +                           -e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/" \ > +                           -e "s/^\\(From [0-9a-f][0-9a-f]*\\) .*/\\1 Mon Sep 17 00:00:00 2001/" >                        echo "\$" >                } >"$actual" && >                if test -f "$expect" > -- > 1.7.0.3 > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at  http://vger.kernel.org/majordomo-info.html >