# Re: [PATCH] Adding rebase merge strategy 2 messages from 2007-08-30 to 2007-08-30. Participants: Tom Clarke, Johannes Schindelin. Thread: https://gitlist.dev/t/9710 ## Tom Clarke, 2007-08-30 19:36 Subject: Re: [PATCH] Adding rebase merge strategy Message-ID: <550f9510708301236y65a9952dofbd69417dc1310ee@mail.gmail.com> URL: https://gitlist.dev/e/550f9510708301236y65a9952dofbd69417dc1310ee%40mail.gmail.com In-Reply-To: <11885023904126-git-send-email-tom@u2i.com> ``` On 8/30/07, Tom Clarke 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. -Tom ``` ## Johannes Schindelin, 2007-08-30 19:53 Subject: Re: [PATCH] Adding rebase merge strategy Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0708302051090.28586%40racer.site In-Reply-To: <550f9510708301236y65a9952dofbd69417dc1310ee@mail.gmail.com> ``` Hi, On Thu, 30 Aug 2007, Tom Clarke wrote: > On 8/30/07, Tom Clarke 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 ```