kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2009-02-05 18:06:11 -08:00
parent 7b261711a6 a15080e5f4
commit c7893501e8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-apply.c
View File

@ -2448,7 +2448,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
if (st_mode != patch->old_mode) if (st_mode != patch->old_mode)
fprintf(stderr, "warning: %s has type %o, expected %o\n", fprintf(stderr, "warning: %s has type %o, expected %o\n",
old_name, st_mode, patch->old_mode); old_name, st_mode, patch->old_mode);
if (!patch->new_mode) if (!patch->new_mode && !patch->is_delete)
patch->new_mode = st_mode; patch->new_mode = st_mode;
return 0; return 0;