From: Johannes Altmanninger <aclopte@gmail.com>
To: Ryan Hodges <rphodges@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: git apply --intent-to-add deletes other files from the index
Date: Sun, 31 Oct 2021 07:43:00 +0100 [thread overview]
Message-ID: <20211031064300.z6lk4wpojwudgxjw@gmail.com> (raw)
In-Reply-To: <C09B3C5C-86D1-47B4-B4BC-9D0355596A1D@gmail.com>
On Sat, Oct 30, 2021 at 02:42:42PM -0700, Ryan Hodges wrote:
> Thank you. I was hoping to be the one that fixed this because it was a level of logic that matched my current knowledge level.
Sorry I should have just confirmed the bug since you had already said to
look into it. (I usually try to send things when they are "done" from my
side to minimize roundtrips.)
I'm sure there are more low-hanging fruits but finding them is the hard part,
see also https://lore.kernel.org/git/xmqq7dl5z425.fsf@gitster.g/
> I was kind of surprised no one has reported this before.
I guess no one has used it since it was added in 2018.
next prev parent reply other threads:[~2021-10-31 6:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 15:11 git apply --indent-to-add deletes other files from the index Ryan Hodges (rhodges)
2021-10-30 20:39 ` git apply --intent-to-add " Johannes Altmanninger
2021-10-30 21:42 ` Ryan Hodges
2021-10-31 6:43 ` Johannes Altmanninger [this message]
2021-10-30 20:41 ` [PATCH] apply: make --intent-to-add not stomp index Johannes Altmanninger
2021-10-30 20:51 ` [PATCH v2] " Johannes Altmanninger
2021-11-01 6:40 ` Junio C Hamano
2021-11-01 7:07 ` Re* " Junio C Hamano
2021-11-06 11:24 ` 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
2021-11-06 11:24 ` [PATCH v2] apply: make --intent-to-add not stomp index 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211031064300.z6lk4wpojwudgxjw@gmail.com \
--to=aclopte@gmail.com \
--cc=git@vger.kernel.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).