From: Patrick Steinhardt <ps@pks.im>
To: Aniket Gupta <aniketgupta3001@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Hannes Brandstätter-Müller" <hannes.mueller@gmail.com>,
git@vger.kernel.org
Subject: Re: [BUG] git apply: pure rename followed by edit fails with core.fileMode=false
Date: Mon, 9 Nov 2026 08:57:30 +0100 [thread overview]
Message-ID: <avF86vESF26lpNv2@pks.im> (raw)
In-Reply-To: <20261107054701.298961-1-aniketgupta3001@gmail.com>
Hi Aniket,
On Sat, Nov 07, 2026 at 05:47:01AM +0000, Aniket Gupta wrote:
> Hey Junio. Yup. Two commits. Hannes feeds the whole format-patch output
> to a single git apply and separate invocations and git am work for him.
> Though applying several patches that touch the same path in one
> invocation is something git apply does on purpose. A pure rename
> followed by an edit worked that way before 0482c32c33 and still does
> with core.fileMode=true. It only breaks with =false.
one ask from my side for mailing list etiquette: could you please keep
the relevant parts of the mail that you're replying to? Otherwise it
becomes very hard to follow the discussion as one has no idea what parts
of the mail you reply to specifically.
Thanks!
Patrick
next prev parent reply other threads:[~2026-11-09 7:57 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-23 13:53 [BUG] git apply: pure rename followed by edit fails with core.fileMode=false Hannes Brandstätter-Müller
2026-11-06 18:11 ` Aniket Gupta
2026-11-06 20:36 ` Junio C Hamano
2026-11-07 4:07 ` Aniket Gupta
2026-11-07 5:25 ` Junio C Hamano
2026-11-07 5:47 ` Aniket Gupta
2026-11-09 7:57 ` Patrick Steinhardt [this message]
2026-11-09 8:13 ` Aniket Gupta
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=avF86vESF26lpNv2@pks.im \
--to=ps@pks.im \
--cc=aniketgupta3001@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hannes.mueller@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox