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 b31007ba99b4ddc92d0b78d847dfbc5a638a8237..58d998577e6d4148ddead9e57bdb0999ff026f73 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2448,7 +2448,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
        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;