{"thread":{"id":"9710","subject":"Re: [PATCH] Adding rebase merge strategy","startedAt":"2007-08-30T19:36:14Z","lastAt":"2007-08-30T19:53:10Z","messageCount":2,"participants":["Tom Clarke","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"51930","messageId":"550f9510708301236y65a9952dofbd69417dc1310ee@mail.gmail.com","threadId":"9710","inReplyTo":"11885023904126-git-send-email-tom@u2i.com","subject":"Re: [PATCH] Adding rebase merge strategy","fromName":"Tom Clarke","fromEmail":"tom@u2i.com","sentAt":"2007-08-30T19:36:14Z","receivedAt":"2007-08-30T19:36:14Z","isPatch":true,"sender":{"key":"tom@u2i.com","avatar":null},"body":"On 8/30/07, Tom Clarke <tom@u2i.com> wrote:\n> +               ( git log --pretty=format:\"%s\" ) >actual &&\n> +       (\n> +               echo \"onbranch\"\n> +               echo \"update\"\n> +               echo -n \"initial\"\n> +       ) >expected &&\n> +       git diff -w -u expected actual\n\nOne issue that I'm curious about. Is it expected that the git log\nformat above doesn't finish with a new line? I couldn't get this test\nto work otherwise.\n\n-Tom\n"},{"id":"51933","messageId":"Pine.LNX.4.64.0708302051090.28586@racer.site","threadId":"9710","inReplyTo":"550f9510708301236y65a9952dofbd69417dc1310ee@mail.gmail.com","subject":"Re: [PATCH] Adding rebase merge strategy","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-08-30T19:53:10Z","receivedAt":"2007-08-30T19:53:10Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 30 Aug 2007, Tom Clarke wrote:\n\n> On 8/30/07, Tom Clarke <tom@u2i.com> wrote:\n> > +               ( git log --pretty=format:\"%s\" ) >actual &&\n> > +       (\n> > +               echo \"onbranch\"\n> > +               echo \"update\"\n> > +               echo -n \"initial\"\n> > +       ) >expected &&\n> > +       git diff -w -u expected actual\n> \n> One issue that I'm curious about. Is it expected that the git log\n> format above doesn't finish with a new line? I couldn't get this test\n> to work otherwise.\n\nIndeed, it does not end in a newline.  However, I'd solve the issue \ndifferently:\n\n- I'd use --pretty=oneline (and use test_tick before every commit, to \n  guarantee consistent object names).\n\n- If you _have_ to keep your way, please use \"printf\", since \"echo -n\" is \n  not portable AFAIK.\n\n- Or just do \"echo > actual\".  And use \"cat << EOF\" like in most of the \n  other tests.\n\nCiao,\nDscho\n"}]}