mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
builtin-apply.c: do not set bogus mode in check_preimage() for deleted 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>
This commit is contained in:
parent
02322e1619
commit
a15080e5f4
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue