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>,
karthiknayak@gmail•com, "Patrick Steinhardt" <ps@pks•im>,
kh@pks•im
Subject: Re: [PATCH v2] stash: honor --no-overwrite-ignore with --all
Date: Mon, 02 Feb 2026 17:48:07 +0100 [thread overview]
Message-ID: <fd0da056-effa-43c8-a387-1db02b5636c8@app.fastmail.com> (raw)
In-Reply-To: <20260202162225.35206-3-pushkarkumarsingh1970@gmail.com>
On Mon, Feb 2, 2026, at 17:22, Pushkar Singh wrote:
> Teach stash push/save to avoid -a cleanup when --no-overwrite-ignore
> is given by downgrading INCLUDE_ALL_FILES to include-untracked.
>
> This fixes ignored files being incorrectly removed despite
> --no-overwrite-ignore, and removes the stash FIXME by plumbing
> overwrite_ignore into unpack_trees().
>
> Add regression tests covering both overwrite and no-overwrite cases.
>
> Changes since v1:
> - Use OPT_BOOL correctly for overwrite-ignore.
> - Fix stash -a cleanup when --no-overwrite-ignore is given by downgrading
> INCLUDE_ALL_FILES to include-untracked.
> - Add regression test for --overwrite-ignore.
> - Adjust no-overwrite-ignore test to explicitly use -a.
> - Add Signed-off-by.
These patch version changes are supposed to go after the `---` (after
the `Signed-off-by`). I guess people who are comfortable editing patches
write them manually in that place (unless something like b4 or
gigitgadget does it for them). I prefer to use `--notes` and let
git-format-patch(1) inject it for me. :)
>
> Signed-off-by: Pushkar Singh <pushkarkumarsingh1970@gmail•com>
> ---
> builtin/stash.c | 14 ++++++++------
> t/t3905-stash-include-untracked.sh | 16 ++++++++++++++--
> 2 files changed, 22 insertions(+), 8 deletions(-)
>[snip]
next prev parent reply other threads:[~2026-02-02 16:48 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
2026-02-02 16:22 ` [PATCH v2] stash: honor --no-overwrite-ignore with --all Pushkar Singh
2026-02-02 16:48 ` Kristoffer Haugsbakk [this message]
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=fd0da056-effa-43c8-a387-1db02b5636c8@app.fastmail.com \
--to=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=karthiknayak@gmail$(echo .)com \
--cc=kh@pks$(echo .)im \
--cc=peff@peff$(echo .)net \
--cc=ps@pks$(echo .)im \
--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