summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-18 09:23:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-18 09:23:56 (GMT)
commitbda53f4185b8f7d2197176fe83afcb8d5f47368b (patch)
tree3db4c003ea5af15f7bff6246dfe6084636096be5 /apply.c
parentc72431ffc9b48e8b9009e1f95afa9db9d87b099a (diff)
parent22cb3835b90f80b2de2bc8f5ff3a9e8eed5ff40a (diff)
downloadgit-bda53f4185b8f7d2197176fe83afcb8d5f47368b.zip
git-bda53f4185b8f7d2197176fe83afcb8d5f47368b.tar.gz
git-bda53f4185b8f7d2197176fe83afcb8d5f47368b.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index 3746310..01793d6 100644
--- a/apply.c
+++ b/apply.c
@@ -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;