summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2018-11-12 20:54:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-13 04:02:52 (GMT)
commit22cb3835b90f80b2de2bc8f5ff3a9e8eed5ff40a (patch)
treedaf7ced071d9155cc8825821726dffc6adf541e6 /apply.c
parentcae598d9980661a978e2df4fb338518f7bf09572 (diff)
downloadgit-22cb3835b90f80b2de2bc8f5ff3a9e8eed5ff40a.zip
git-22cb3835b90f80b2de2bc8f5ff3a9e8eed5ff40a.tar.gz
git-22cb3835b90f80b2de2bc8f5ff3a9e8eed5ff40a.tar.bz2
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 ad6e8ed37bc1 (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>
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index e485fbc..5fb8ecf 100644
--- a/apply.c
+++ b/apply.c
@@ -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;