]> git.ipfire.org Git - thirdparty/git.git/commit - apply.c
apply --recount: allow "no-op hunks"
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 12 Nov 2018 20:54:49 +0000 (12:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Nov 2018 04:02:52 +0000 (13:02 +0900)
commit22cb3835b90f80b2de2bc8f5ff3a9e8eed5ff40a
treedaf7ced071d9155cc8825821726dffc6adf541e6
parentcae598d9980661a978e2df4fb338518f7bf09572
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>
apply.c
t/t4136-apply-check.sh