From: Jeff King <peff@peff.net>
Date: Tue, 20 Nov 2007 11:13:18 GMT
Subject: Re: ! [rejected] master -> master (non-fast forward)
Message-ID: <20071120111317.GA4120@sigill.intra.peff.net>
In-Reply-To: <20071120065021.GA4172@steel.home>

On Tue, Nov 20, 2007 at 07:50:21AM +0100, Alex Riesen wrote:

> > Alex, are you going to rework your "consolidate nonff errors and print a
> > more extended message" patch on top of what's in next (I think it should
> > be much simpler now).
> 
> Do you mean that "Beautify the output of send-pack a bit", Message-ID:
> <20071112221140.GD2918@steel.home>?
> 
> If so, I'm confused. Didn't you already do that in your recent
> "send-pack:" patch series? It looked to me as if you did (except for
> the hint regarding non-ff branches to be updated everything is there).

That is what I meant. In the current code, the errors aren't
consolidated at the end, and as you mentioned, we don't print the extra
message. Two patch series follows (but see comments on each patch).

-Peff