Re: Octopus merge: unique (?) to git, but is it useful?

From: SZEDER Gábor <szeder@ira.uka.de>
Date: Jun 3, 2008, 20:39 UTC
Message-ID: <20080603203924.GA6588@neumann>
In-Reply-To: <7vabi22u5h.fsf@gitster.siamese.dyndns.org>

On Tue, Jun 03, 2008 at 12:30:34PM -0700, Junio C Hamano wrote:

Show 6 quoted lines

> > ...  It
> > fails at the line 'EDITOR=: git commit -a'.
> 
> Sorry, because it works for me (and presumably for many others --- I
> haven't seen anybody else reporting the breakage you have), you need to
> help others to diagnose it with a bit more details.

With debug and verbose options it says following:

* expecting success:

        git rev-parse second master >expect &&
        test_must_fail git merge second master &&
        git checkout master g &&
        echo "here comes the breakage" &&
        EDITOR=: git commit -a &&
        echo "survived!" &&
        git cat-file commit HEAD | sed -n -e "s/^parent //p" -e "/^$/q" >actual &&
        test_cmp expect actual

*** Please tell me who you are.

Run

  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

to set your account's default identity. Omit --global to set the identity only in this repository.

fatal: empty ident  <szeder@neumann.(none)> not allowed
here comes the breakage
fatal: no commit message?  aborting commit.
* FAIL 18: Hand committing of a redundant merge removes dups
        
        
                git rev-parse second master >expect &&
                test_must_fail git merge second master &&
                git checkout master g &&
                echo "here comes the breakage" &&
                EDITOR=: git commit -a &&
                echo "survived!" &&
                git cat-file commit HEAD | sed -n -e "s/^parent //p" -e "/^$/q" >actual &&
                test_cmp expect actual

* failed 1 among 18 test(s)
make: *** [t7502-commit.sh] Error 1

My /bin/sh is dash, but it breaks with bash, too.

What else could/should I provide?

Regards, Gábor