diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:56 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:56 +0900 |
commit | bda53f4185b8f7d2197176fe83afcb8d5f47368b (patch) | |
tree | 3db4c003ea5af15f7bff6246dfe6084636096be5 /apply.c | |
parent | Merge branch 'ra/rev-parse-exclude-glob' (diff) | |
parent | apply --recount: allow "no-op hunks" (diff) | |
download | tgif-bda53f4185b8f7d2197176fe83afcb8d5f47368b.tar.xz |
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"
Diffstat (limited to 'apply.c')
-rw-r--r-- | apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1748,7 +1748,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; |