Re: git 1.8.0.rc0.18.gf84667d trouble with "git commit -p file"
- From
Jeff King <peff@peff.net>
- Date
- Oct 7, 2012, 21:49 UTC
- Message-ID
- <20121007214958.GC1743@sigill.intra.peff.net>
- In-Reply-To
- <7vr4paovjq.fsf@alter.siamese.dyndns.org>
On Sun, Oct 07, 2012 at 01:51:21PM -0700, Junio C Hamano wrote:
Show 23 quoted lines
> Jeff King <peff@peff.net> writes: > > > Yes. The more we talk about it, the more turned off I am by the idea. > > Above I posed my questions as "what _should_ we do when...". And I still > > think we _should_ default to --only with interactive, if we can find > > sane semantics. But until we can find them, it obviously does not make > > sense to enable it, and the whole discussion is stalled. And we must > > come up with an interim solution that is the least bad. > > > > Which is obviously one of: > > > > 1. Keep defaulting to "--include", as that is what we have been doing. > > > > 2. Forbid the cases where it would matter (i.e., when the index and > > HEAD differ). > > > > The former is more convenient, but the latter is safer against > > future breakage. I'm OK either way, but option (1) clearly needs a > > documentation update. > > Yeah, I agree with the reasoning. This is an unessential feature > that is with the problem for a long time, so let's go the route #1 > first before we do anything else.
OK. I think Conrad's patch takes us most of the way there. I had a few minor comments, but I think another round should do it. Conrad?
-Peff