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

[Junio C Hamano <gitster@pobox.com>]

SZEDER Gábor <szeder@ira.uka.de> writes:

> On Tue, Jun 03, 2008 at 03:08:48PM -0700, Junio C Hamano wrote:
>> Here is a potential fix.
>> 
>> The first hunk is the more relevant one; although the second one is also a
>> fix, it is independent.  It is a fix to unnecessarily loosely written test
>> that was done in early February.
> Yes, the first hunk fixes the problem (and the second one does not
> introduce any new breakage on my system ;)
>
> However, I don't really see why the new test failed only at me...

Perhaps it is because your GECOS setting leads to this error:

	fatal: empty ident  <szeder@neumann.(none)> not allowed

The reason the first hunk is a fix is because that particular test tries
to see what happens when the committer identity comes from the default
places (i.e. hostname, ident and GECOS) by removing the environment
variable.  For all the other tests, however, we explicitly set committer
and author identities by setting necessary environment variables so that
the tests will be repeatable for everybody.  That test, however, removed
the environment variable for all the later tests, which made them
unreliable (works for some people, not work for others).