From: Miklos Vajna Date: Fri, 26 Sep 2008 06:24:04 GMT Subject: Re: [PATCH] builtin-commit: avoid using reduce_heads() Message-ID: <20080926062404.GR23137@genesis.frugalware.org> In-Reply-To: <20080926010312.GE6816@neumann> On Fri, Sep 26, 2008 at 03:03:12AM +0200, SZEDER Gábor wrote: > Szia Miklós, :) > unfortunately it introduces a new one: t7502-commit.sh > fails at me with the following: > > > * ok 17: a SIGTERM should break locks > > * expecting success: > > git rev-parse second master >expect && > test_must_fail git merge second master && > git checkout master g && > EDITOR=: git commit -a && > git cat-file commit HEAD | sed -n -e "s/^parent //p" -e > "/^$/q" >actual && > test_cmp expect actual Uh-oh. I forgot to make test before git send-email. I'll have a look at it later today.