From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: Vegard Nossum <vegard.nossum@oracle.com>,
git@vger.kernel.org,
Christian Couder <christian.couder@gmail.com>,
Michal Zalewski <lcamtuf@google.com>
Subject: Re: [PATCH 1/2] apply: guard against renames of non-existant empty files
Date: Mon, 27 Feb 2017 12:10:18 -0800 [thread overview]
Message-ID: <xmqqinnvwg2d.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <baf195cc-ef81-bbad-4e01-4149498efedb@web.de> ("René Scharfe"'s message of "Sat, 25 Feb 2017 21:51:47 +0100")
René Scharfe <l.s.r@web.de> writes:
> Would it make sense to mirror the previously existing condition and
> check for is_new instead? I.e.:
>
> if ((!patch->is_delete && !patch->new_name) ||
> (!patch->is_new && !patch->old_name)) {
>
Yes, probably.
> or
>
> if (!(patch->is_delete || patch->new_name) ||
> !(patch->is_new || patch->old_name)) {
This happens after calling parse_git_header() so we should know the
actual value of is_delete and is_new by now (instead of mistaking
-1 aka "unknown" as true), so this rewrite would also be OK.
next prev parent reply other threads:[~2017-02-27 20:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-25 10:13 [PATCH 1/2] apply: guard against renames of non-existant empty files Vegard Nossum
2017-02-25 10:13 ` [PATCH 2/2] apply: handle assertion failure gracefully Vegard Nossum
2017-02-25 21:21 ` René Scharfe
2017-02-27 20:04 ` Junio C Hamano
2017-02-27 22:18 ` René Scharfe
2017-02-27 22:33 ` Junio C Hamano
2017-02-28 10:50 ` René Scharfe
2017-06-27 17:03 ` René Scharfe
2017-06-27 18:08 ` Junio C Hamano
2017-06-27 20:20 ` René Scharfe
2017-06-27 21:39 ` Junio C Hamano
2017-06-27 17:03 ` René Scharfe
2017-02-25 11:59 ` [PATCH 1/2] apply: guard against renames of non-existant empty files Philip Oakley
2017-02-25 12:06 ` Vegard Nossum
2017-02-25 12:47 ` Philip Oakley
2017-02-25 20:51 ` René Scharfe
2017-02-27 20:10 ` Junio C Hamano [this message]
2017-02-27 22:18 ` René Scharfe
2017-06-27 17:03 ` René Scharfe
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=xmqqinnvwg2d.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=lcamtuf@google.com \
--cc=vegard.nossum@oracle.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.