From: Junio C Hamano <gitster@pobox.com>
To: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>
Cc: "Jason Cho" <jason11choca@proton.me>,
"git@vger.kernel.org" <git@vger.kernel.org>,
"aclopte@gmail.com" <aclopte@gmail.com>,
"rhodges@cisco.com" <rhodges@cisco.com>,
"rphodges@gmail.com" <rphodges@gmail.com>
Subject: Re: [PATCH v3] apply: --intent-to-add should imply --index
Date: Thu, 01 May 2025 09:31:56 -0700 [thread overview]
Message-ID: <xmqqmsbwxpfn.fsf@gitster.g> (raw)
In-Reply-To: <8a61dc13-0b7e-437d-b060-c17bff483c7a@app.fastmail.com> (Kristoffer Haugsbakk's message of "Thu, 01 May 2025 14:48:11 +0200")
"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com> writes:
>> Johannes Altmanninger submitted patch v3 titled "apply: --intent-to-add
>> should imply --index" to fix this issue.
>>
>> Is this fix merged? If so, which Git version includes this fix.
>
> I can’t find any commits by Johannes Altmanninger that addresses this.
> I also can’t find any commits that start with `apply: --intent-to-add`.
The documentation says this:
--intent-to-add::
When applying the patch only to the working tree, mark new
files to be added to the index later (see `--intent-to-add`
option in linkgit:git-add[1]). This option is ignored unless
running in a Git repository and `--index` is not specified.
Note that `--index` could be implied by other options such
as `--cached` or `--3way`.
It is clear that whoever wrote it understands that for this option
to be effective, the patch needs to affect the index, and one way to
do so is for the user to pass `--index`. But at the same time, that
is not the only option that makes the command touch the index (e.g.,
`--cached` does, too), and it would make it behave incorrectly if a
patch automatically pretends that `--index` was given when this
option was given.
I can't find the patch either, but given the above documentation, is
it even still relevant?
Thanks.
next prev parent reply other threads:[~2025-05-01 16:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-01 9:03 [PATCH v3] apply: --intent-to-add should imply --index Jason Cho
2025-05-01 12:48 ` Kristoffer Haugsbakk
2025-05-01 16:31 ` Junio C Hamano [this message]
2025-05-02 4:11 ` Ryan Hodges
2025-05-03 3:51 ` Raymond E. Pasco
2025-05-03 8:22 ` Raymond E. Pasco
2025-05-11 0:36 ` [PATCH 0/5] apply: fix apply --intent-to-add Raymond E. Pasco
2025-05-11 0:36 ` [PATCH 1/5] apply: error on --intent-to-add outside gitdir Raymond E. Pasco
2025-05-11 0:36 ` [PATCH 2/5] apply: read in the index in --intent-to-add mode Raymond E. Pasco
2025-05-12 2:13 ` Raymond E. Pasco
2025-05-13 17:52 ` Jason Cho
2025-05-11 0:36 ` [PATCH 3/5] apply: only write intents to add for new files Raymond E. Pasco
2025-05-11 0:36 ` [PATCH 4/5] t4140: test apply --intent-to-add interactions Raymond E. Pasco
2025-05-11 0:36 ` [PATCH 5/5] apply docs: clarify wording for --intent-to-add Raymond E. Pasco
-- strict thread matches above, loose matches on Subject: below --
2021-11-06 11:24 Re* [PATCH v2] apply: make --intent-to-add not stomp index Johannes Altmanninger
2021-11-06 11:42 ` [PATCH v3] apply: --intent-to-add should imply --index Johannes Altmanninger
2021-11-06 11:47 ` Johannes Altmanninger
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=xmqqmsbwxpfn.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=aclopte@gmail.com \
--cc=git@vger.kernel.org \
--cc=jason11choca@proton.me \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=rhodges@cisco.com \
--cc=rphodges@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;
as well as URLs for NNTP newsgroup(s).