Merge branch 'jc/maint-apply-fix' into maint
* jc/maint-apply-fix:
builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
diff --git a/builtin-apply.c b/builtin-apply.c
index b31007b..58d9985 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2448,7 +2448,7 @@
if (st_mode != patch->old_mode)
fprintf(stderr, "warning: %s has type %o, expected %o\n",
old_name, st_mode, patch->old_mode);
- if (!patch->new_mode)
+ if (!patch->new_mode && !patch->is_delete)
patch->new_mode = st_mode;
return 0;
