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
git-mirror · Feb 6, 2009 · c789350 · c789350
2 parents 7b26171 + a15080e
commit c789350
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;