From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 1 Feb 2009 02:08:58 +0000 (-0800)
Subject: Merge branch 'jc/maint-apply-fix'
X-Git-Tag: v1.6.2-rc0~42
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/15b8e94aee06f004da178bc0bfaabd50a0fda242?hp=32f2f11f39bf8fe0cfebdfbc36cc2476507d5f1c

Merge branch 'jc/maint-apply-fix'

* 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 b415daf07e..1e7f917d39 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2453,7 +2453,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;