Re: [PATCH] t7600: merge tag shoud create a merge commit

2013-03-22 Thread Jeff King
On Fri, Mar 22, 2013 at 03:56:15PM +0100, Yann Droneaud wrote: > Le 22.03.2013 15:48, Junio C Hamano a écrit : > >> > >>It's not in final shape: the line > >> > >>EDITOR=false test_must_fail git merge signed > > > >Because test_must_fail is a shell function, single-shot environment > >assignme

Re: [PATCH] t7600: merge tag shoud create a merge commit

2013-03-22 Thread Yann Droneaud
Le 22.03.2013 15:48, Junio C Hamano a écrit : It's not in final shape: the line EDITOR=false test_must_fail git merge signed Because test_must_fail is a shell function, single-shot environment assignment like this should not be used. It's used throughout the test. The test 'merge --no-e

Re: [PATCH] t7600: merge tag shoud create a merge commit

2013-03-22 Thread Junio C Hamano
y...@quest-ce.net writes: > From: Yann Droneaud > > This test ensures a merge commit is always created > when merging an annotated (signed) tag without --ff-only option. > > Signed-off-by: Yann Droneaud > --- > > Here's a proposition for a test tath check the creation of a merge commit > when me

[PATCH] t7600: merge tag shoud create a merge commit

2013-03-22 Thread y
From: Yann Droneaud This test ensures a merge commit is always created when merging an annotated (signed) tag without --ff-only option. Signed-off-by: Yann Droneaud --- Here's a proposition for a test tath check the creation of a merge commit when merging a tag. It's not in final shape: the l