Re: [PATCH] stash: honor --no-overwrite-ignore when updating index

From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: Feb 2, 2026, 14:21 UTC
Message-ID: <1abb1fa0-3548-4258-95d9-0505ea446043@app.fastmail.com>
In-Reply-To: <20260202131921.15175-2-pushkarkumarsingh1970@gmail.com>

On Mon, Feb 2, 2026, at 14:19, Pushkar Singh wrote:

> The stash code unconditionally cleared opts.preserve_ignored when
> updating the index, leaving a FIXME suggesting this should depend on
> an overwrite_ignore flag.

The commit message should discuss what the code does without the patch in the present tense (SubmittingPathces, “present-tense”).

Show 7 quoted lines

>
> Introduce overwrite_ignore plumbing for git stash push/save and use it
> to control preserve_ignored during reset_tree(). Add a test to verify
> that --no-overwrite-ignore preserves ignored files.
>
> This removes the long-standing FIXME and aligns stash behavior with
> checkout/reset/merge.

Missing signoff.

Show 5 quoted lines

> ---
>  builtin/stash.c                    | 11 ++++++++++-
>  t/t3905-stash-include-untracked.sh | 13 +++++++++++++
>  2 files changed, 23 insertions(+), 1 deletion(-)
>[snip]