Merge branch 'js/apply-recount-allow-noop'
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:56 +0000 (18:23 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Nov 2018 09:23:56 +0000 (18:23 +0900)
commitbda53f4185b8f7d2197176fe83afcb8d5f47368b
tree3db4c003ea5af15f7bff6246dfe6084636096be5
parentc72431ffc9b48e8b9009e1f95afa9db9d87b099a
parent22cb3835b90f80b2de2bc8f5ff3a9e8eed5ff40a
Merge branch 'js/apply-recount-allow-noop'

When editing a patch in a "git add -i" session, a hunk could be
made to no-op.  The "git apply" program used to reject a patch with
such a no-op hunk to catch user mistakes, but it is now updated to
explicitly allow a no-op hunk in an edited patch.

* js/apply-recount-allow-noop:
  apply --recount: allow "no-op hunks"
apply.c