Alexander Potashev <aspotashev@xxxxxxxxx> writes: > builtin-apply.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/builtin-apply.c b/builtin-apply.c > index 07244b0..071f6d8 100644 > --- a/builtin-apply.c > +++ b/builtin-apply.c > @@ -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,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); > + patch->new_mode = st_mode; Can you do this unconditionally, overwriting whatever we read from the patch header metainfo lines? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
