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

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Junio C Hamano <gitster@...>
Cc: Linus Torvalds <torvalds@...>, <git@...>
Date: Tuesday, June 3, 2008 - 4:39 pm

On Tue, Jun 03, 2008 at 12:30:34PM -0700, Junio C Hamano wrote:
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

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Octopus merge: unique (?) to git, but is it useful?, Jakub Narebski, (Mon Jun 2, 9:14 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Jakub Narebski, (Tue Jun 3, 7:27 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Daniel Villeneuve, (Mon Jun 2, 10:16 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Linus Torvalds, (Mon Jun 2, 10:05 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Jakub Narebski, (Tue Jun 3, 3:32 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Linus Torvalds, (Tue Jun 3, 3:54 pm)
Re: Commit annotations (was:: Octopus merge: unique (?) to g..., Johannes Schindelin, (Tue Jun 3, 4:33 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 3:53 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 12:29 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Jakub Narebski, (Tue Jun 3, 2:39 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 3:11 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Mon Jun 2, 11:56 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Linus Torvalds, (Tue Jun 3, 10:40 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 8:33 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 1:17 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 3:30 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, SZEDER , (Tue Jun 3, 4:39 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 6:08 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 9:02 pm)
Re: Octopus merge: unique (?) to git, but is it useful?, Johannes Schindelin, (Tue Jun 3, 1:28 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Junio C Hamano, (Tue Jun 3, 1:42 am)
Re: Octopus merge: unique (?) to git, but is it useful?, Johannes Schindelin, (Tue Jun 3, 4:31 am)