apply --recount: allow "no-op hunks"

When editing patches e.g. in `git add -e`, it is quite common that a
hunk ends up having no -/+ lines, i.e. it is now supposed to do nothing.

This use case was broken by ad6e8ed37b (apply: reject a hunk that does
not do anything, 2015-06-01) with the good intention of catching a very
real, different issue in hand-edited patches.

So let's use the `--recount` option as the tell-tale whether the user
would actually be okay with no-op hunks.

Add a test case to make sure that this use case does not regress again.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin
2018-11-12 12:54:49 -08:00
committed by Junio C Hamano
parent cae598d998
commit 22cb3835b9
2 changed files with 13 additions and 1 deletions

View File

@@ -1747,7 +1747,7 @@ static int parse_fragment(struct apply_state *state,
}
if (oldlines || newlines)
return -1;
if (!deleted && !added)
if (!patch->recount && !deleted && !added)
return -1;
fragment->leading = leading;