Re: [PATCH v3] apply: --intent-to-add should imply --index

From: Raymond E. Pasco <ray@ameretat.dev>
Date: May 3, 2025, 08:22 UTC
Message-ID: <5xsywkqp5nctahl26yb6hrhv5sytbzwvhxqvs5y74e46xepmxq@j7o5kxivw24x>
In-Reply-To: <4e2szrowd43w6lrzawqtddamdxvp6ke65jkzmdoru4gjin7xhn@kaqe7skrktgt>

On 25/05/02 11:51PM, Raymond E. Pasco wrote:

Show 9 quoted lines

> However, the code appears entirely correct. The combination of --cached
> with -N doesn't work, despite the message claiming it does, but it can't
> possibly work because it includes the file in the index, so it can't
> include it as an intent to add in the index. So this just merits a note
> that --intent-to-add is mutually exclusive with both --index and
> --cached.
> 
> If the original author (Johannes Altmanninger) isn't around or doesn't
> want to, I can clean this patch up for resubmission.

In fact, I've just discovered an additional issue that remains even post-patch (it tries to apply the whole diff, even parts that are not new file additions, with ita_only on), so it needs slightly more work than implied above to be complete.