From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Sep 2010 01:44:20 GMT
Subject: Re: [PATCH 09/37] t6020: Modernize style a bit
Message-ID: <7v7hietuvf.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTin3wXKUJoRtdk4e1KT5Gwo1H1+9H07LU313Ubo1@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

>> The old version requested a particular kind of failure. Are you saying
>> that with modern 'git merge' all non-zero exit codes mean the same kind of
>> failure?
>
> No, I'm saying that I don't think the test meant to try to distinguish
> between exit codes.

The check for status 1 comes from 72d1216 (New test case: merge with
directory/file conflicts, 2005-12-03), and if you read git-merge.sh from
that era, you would notice that at least we do not want to see status 2
(merge wrapper failed in a bad way) from this test.  git-merge was
designed to exit with status 1 when (and only when) the merge request was
reasonable, it did its best effort and left conflict to be resolved in the
working tree.