From: Jeff King <peff@peff.net>
Date: Sun, 30 Nov 2008 19:14:44 GMT
Subject: Re: [PATCH 3/3] git add --intent-to-add: do not let an empty blob committed by accident
Message-ID: <20081130191444.GC10981@coredump.intra.peff.net>
In-Reply-To: <7vk5an2nil.fsf_-_@gitster.siamese.dyndns.org>

On Fri, Nov 28, 2008 at 07:56:34PM -0800, Junio C Hamano wrote:

> Subject: Re: [PATCH 3/3] git add --intent-to-add: do not let an empty blob
>	committed by accident

Minor nit: grammatical error in the subject.

> This implies that you cannot "git commit" from such a state; however "git
> commit -a" still works.

I was going to provide a test for "git commit -a" to squash in, but it
looks like the version in 'pu' already has one.

>  	case WRITE_TREE_UNMERGED_INDEX:
> -		die("%s: error building trees; the index is unmerged?", me);
> +		die("%s: error building trees", me);

This caught me by surprise while reading, but I assume the rationale is
"now there is a new, different reason not to be able to build the trees,
so our guess is less likely to be correct". I wonder if we can do better
by actually passing out a more exact error value (though it looks like
we will already have said "foo: not added yet" by that point anyway, so
maybe it is just pointless to say more).

> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh

Why in t3701? These don't have anything to do with interactive add, and
there is a already a t2203-add-intent.

-Peff