From: Junio C Hamano <gitster@pobox.com>
To: Aniket Gupta <aniketgupta3001@gmail.com>
Cc: "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: Fri, 06 Nov 2026 21:25:25 -0800 [thread overview]
Message-ID: <xmqqfqxd9pru.fsf@gitster.g> (raw)
In-Reply-To: <20261107040715.436-1-aniketgupta3001@gmail.com> (Aniket Gupta's message of "Sat, 7 Nov 2026 04:07:15 +0000")
Aniket Gupta <aniketgupta3001@gmail.com> writes:
> The series in Hannes's report is valid input which is what format-patch
> makes for a commit that renames a file followed by one which edits it.
Do you mean these are two commits, and format-patch created two
messages?
If so, applying these two patches in one invocation of "git apply"
is exactly what I was questioning. I would understand two separate
invocations of "git apply", or "git am" fed two input files, though.
next prev parent reply other threads:[~2026-11-07 5:25 UTC|newest]
Thread overview: 6+ 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 [this message]
2026-11-07 5:47 ` 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=xmqqfqxd9pru.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=aniketgupta3001@gmail.com \
--cc=git@vger.kernel.org \
--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