mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ap/maint-apply-modefix'

Browse Source 
* ap/maint-apply-modefix:
  builtin-apply: prevent non-explicit permission changes
This commit is contained in:
Junio C Hamano
2009-01-03 13:57:10 -08:00
parent cca1704897 1f7903a371
commit caf8b2fbd4
2 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-apply.c
View File

@ -630,7 +630,7 @@ static int gitdiff_index(const char *line, struct patch *patch)
memcpy(patch->new_sha1_prefix, line, len);
patch->new_sha1_prefix[len] = 0;
if (*ptr == ' ')
patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
patch->old_mode = strtoul(ptr+1, NULL, 8);
return 0;
}
@ -2447,6 +2447,8 @@ 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)
patch->new_mode = st_mode;
return 0;
is_new: