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 <chris@xxxxxxxxxxxx> wrote: > Signed-off-by: Chris Webb <chris@xxxxxxxxxxxx> > --- > 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@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html