From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 30 Aug 2007 19:53:10 GMT
Subject: Re: [PATCH] Adding rebase merge strategy
Message-ID: <Pine.LNX.4.64.0708302051090.28586@racer.site>
In-Reply-To: <550f9510708301236y65a9952dofbd69417dc1310ee@mail.gmail.com>

Hi,

On Thu, 30 Aug 2007, Tom Clarke wrote:

> On 8/30/07, Tom Clarke <tom@u2i.com> wrote:
> > +               ( git log --pretty=format:"%s" ) >actual &&
> > +       (
> > +               echo "onbranch"
> > +               echo "update"
> > +               echo -n "initial"
> > +       ) >expected &&
> > +       git diff -w -u expected actual
> 
> One issue that I'm curious about. Is it expected that the git log
> format above doesn't finish with a new line? I couldn't get this test
> to work otherwise.

Indeed, it does not end in a newline.  However, I'd solve the issue 
differently:

- I'd use --pretty=oneline (and use test_tick before every commit, to 
  guarantee consistent object names).

- If you _have_ to keep your way, please use "printf", since "echo -n" is 
  not portable AFAIK.

- Or just do "echo > actual".  And use "cat << EOF" like in most of the 
  other tests.

Ciao,
Dscho