Re: [PATCH 3/5] apply: only write intents to add for new files

From

Junio C Hamano <gitster@pobox.com>

Date

Jun 30, 2025, 18:53 UTC

Message-ID

<xmqq7c0t12oz.fsf@gitster.g>

In-Reply-To

<20250628225819.1294068-5-ray@ameretat.dev>

"Raymond E. Pasco" <ray@ameretat.dev> writes:

> In the "update only the worktree" mode, the index should not be touched
> except to record intents to add when --intent-to-add is on. Because
> having --intent-to-add on sets update_index, to indicate that we are
> touching the index, we can't rely only on that flag to decide whether to
> write an index entry.

>  	if (patch->conflicted_threeway)
>  		return add_conflicted_stages_file(state, patch);
> -	else if (state->update_index)
> +	else if (state->check_index || (state->ita_only && patch->is_new > 0))

>  		return add_index_file(state, path, mode, buf, size);
>  	return 0;
>  }