From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Tom Clarke <tom@u2i.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Adding rebase merge strategy
Date: Thu, 30 Aug 2007 20:53:10 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0708302051090.28586@racer.site> (raw)
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
next prev parent reply other threads:[~2007-08-30 19:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <11885023904126-git-send-email-tom@u2i.com>
2007-08-30 19:36 ` [PATCH] Adding rebase merge strategy Tom Clarke
2007-08-30 19:53 ` Johannes Schindelin [this message]
2007-09-28 16:15 Tom Clarke
2007-09-28 17:03 ` Johannes Schindelin
2007-09-28 17:18 ` Tom Clarke
2007-10-01 15:08 ` Tom Clarke
2007-10-01 15:50 ` Johannes Schindelin
2007-10-01 21:01 ` Junio C Hamano
2007-10-01 21:41 ` Tom Clarke
2007-10-01 22:17 ` Carl Worth
2007-10-01 22:21 ` Tom Clarke
2007-10-01 22:30 ` Shawn O. Pearce
2007-10-01 22:53 ` Carl Worth
2007-10-01 23:11 ` Junio C Hamano
2007-10-02 10:00 ` Johannes Schindelin
2007-10-02 10:29 ` Tom Clarke
2007-10-02 18:40 ` Junio C Hamano
2007-10-03 14:11 ` Tom Clarke
2007-10-03 15:54 ` Johannes Schindelin
2007-10-01 23:09 ` J. Bruce Fields
2007-10-01 22:28 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0708302051090.28586@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=tom@u2i.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).