From: Junio C Hamano <gitster@pobox.com>
To: Alexander Potashev <aspotashev@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [RFC PATCH] builtin-apply: prevent non-explicit permission changes
Date: Thu, 01 Jan 2009 05:00:27 -0800 [thread overview]
Message-ID: <7vfxk3npuc.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20081230235357.GA12747@myhost> (Alexander Potashev's message of "Wed, 31 Dec 2008 02:53:57 +0300")
Alexander Potashev <aspotashev@gmail.com> 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?
next prev parent reply other threads:[~2009-01-01 13:01 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-30 23:53 [RFC PATCH] builtin-apply: prevent non-explicit permission changes Alexander Potashev
2009-01-01 13:00 ` Junio C Hamano [this message]
2009-01-01 22:17 ` Alexander Potashev
2009-01-02 0:56 ` Junio C Hamano
2009-01-02 13:37 ` Alexander Potashev
2009-01-02 10:55 ` Junio C Hamano
2009-01-02 17:35 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vfxk3npuc.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=aspotashev@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).