Re: [PATCH 1/2] Allow git-apply to fix up the line counts

Hi,

On Thu, 5 Jun 2008, Johannes Sixt wrote:

quoted

Now, if you say they are _ignored_, would that not imply in plain 
English that they are left unchanged (in limbo, because those two 
types of numbers contradict each other)?

That you *internally* rewrite those numbers and then do *not* ignore 
them is totally pointless for the user. It's an implementation detail. 
The user doesn't see what is going on nor should he care. From the 
user's perspective, the hunk header line counts are _ignored_ (because 
if they were not ignored, then there would be an error message in the 
contradicting case).

quoted

Okay, how about shikebedding this to --adjust-line-counts?

From the user's perspective, nothing is "adjusted"; the hunk header line 
counts are ... you guess it ... *ignored*.

Oh... I start to see what you mean.  It's just that for me, the line 
counts are the actual line counts, not what is recorded in the hunk 
header.

In any case, I really do not feel strongly about it, since I do not want 
to use it, except with git add -e.  Which I really grew fond of in these 
last hours ;-)

So how about --ignore-hunk-headers?  I think this is much more 
descriptive, and catches your complaint, IMHO.

Ciao,
Dscho