From: Junio C Hamano Date: Wed, 18 May 2011 05:03:03 GMT Subject: Re: [PATCH] add -i: ignore terminal escape sequences Message-ID: <7vei3weh2w.fsf@alter.siamese.dyndns.org> In-Reply-To: Sverre Rabbelier writes: > On Tue, May 17, 2011 at 20:52, Junio C Hamano wrote: >> Jokes aside, it may make sense to offer an extra confirmation for "a" and >> possibly "s" in single-key mode. Unlike others, they are destructive when >> the changes you are splitting from the working tree is large-ish. > > I don't understand why/how 's' is destructive? Doesn't it just ask you > again for each of the split hunks? I think "add -p" used to have an internal mechanism to merge the adjacent split hunks back to a single hunk, so if we wanted to we could have given users a way to recover from a mistaken "s"plit, but I don't think we kept that code, so there is no way to properly "recover" from such a mistake. Yes, it may be just the matter of two easy keystrokes, either yy or nn, to recover from such a mistake, and that is why I said "possibly". It is nevertheless destructive in the sense that you cannot recover without quitting the current session and restarting. Of course Thomas could have simply done "reset" and started from scratch, so in that sense nothing is destructive, but we are not talking about the kind of destructive operations you cannot possibly recover without typing everything again.