Merge branch 'nd/dwim-wildcards-as-pathspecs'

diff --git a/builtin/apply.c b/builtin/apply.c
index 146be97a1a879242aa12eb066c5c69cd6af92409..54aba4e351257f8bc4b46d3f507c1ed9525ec7fc 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -1638,6 +1638,9 @@ static int parse_fragment(const char *line, unsigned long size,
        }
        if (oldlines || newlines)
                return -1;
+       if (!deleted && !added)
+               return -1;
+
        fragment->leading = leading;
        fragment->trailing = trailing;