builtin-apply.c: do not set bogus mode in check_preimage() for delete…

…d path If it is deleted, it is deleted. Do not set the current mode to it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Jan 29, 2009 · a15080e · a15080e
1 parent 02322e1
commit a15080e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/builtin-apply.c b/builtin-apply.c
@@ -2447,7 +2447,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;