From: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail•com>
To: "Pushkar Singh" <pushkarkumarsingh1970@gmail•com>, git@vger•kernel.org
Cc: "Junio C Hamano" <gitster@pobox•com>, "Jeff King" <peff@peff•net>
Subject: Re: [PATCH] stash: honor --no-overwrite-ignore when updating index
Date: Mon, 02 Feb 2026 15:21:01 +0100 [thread overview]
Message-ID: <1abb1fa0-3548-4258-95d9-0505ea446043@app.fastmail.com> (raw)
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”).
>
> 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.
> ---
> builtin/stash.c | 11 ++++++++++-
> t/t3905-stash-include-untracked.sh | 13 +++++++++++++
> 2 files changed, 23 insertions(+), 1 deletion(-)
>[snip]
next prev parent reply other threads:[~2026-02-02 14:21 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-02 13:19 [PATCH] stash: honor --no-overwrite-ignore when updating index Pushkar Singh
2026-02-02 14:10 ` Karthik Nayak
2026-02-02 19:37 ` D. Ben Knoble
2026-02-02 14:20 ` Patrick Steinhardt
2026-02-02 14:21 ` Kristoffer Haugsbakk [this message]
2026-02-02 16:22 ` [PATCH v2] stash: honor --no-overwrite-ignore with --all Pushkar Singh
2026-02-02 16:48 ` Kristoffer Haugsbakk
2026-02-02 17:09 ` Pushkar Singh
2026-02-02 20:00 ` D. Ben Knoble
2026-02-02 20:31 ` Elijah Newren
2026-02-03 18:18 ` Pushkar Singh
2026-02-03 19:22 ` Elijah Newren
2026-02-03 18:04 ` [PATCH v3] " Pushkar Singh
2026-02-03 19:22 ` Elijah Newren
2026-02-03 20:07 ` Pushkar Singh
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=1abb1fa0-3548-4258-95d9-0505ea446043@app.fastmail.com \
--to=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=pushkarkumarsingh1970@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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