Git development
 help / color / mirror / Atom feed
From: Aniket Gupta <aniketgupta3001@gmail.com>
To: Junio C Hamano <gitster@pobox.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: Sat,  7 Nov 2026 05:47:01 +0000	[thread overview]
Message-ID: <20261107054701.298961-1-aniketgupta3001@gmail.com> (raw)
In-Reply-To: <xmqqfqxd9pru.fsf@gitster.g>

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.

Thanks,
Aniket

      reply	other threads:[~2026-11-07  5:47 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
2026-11-07  5:47         ` Aniket Gupta [this message]

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=20261107054701.298961-1-aniketgupta3001@gmail.com \
    --to=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