From: "D. Ben Knoble" <ben.knoble@gmail.com>
To: git@vger.kernel.org
Cc: "D. Ben Knoble" <ben.knoble@gmail.com>,
Eli Barzilay <eli@barzilay.org>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH 0/2] Hi all,
Date: Sat, 19 Sep 2026 17:26:34 -0400 [thread overview]
Message-ID: <cover.1789853192.git.ben.knoble@gmail.com> (raw)
This small patch series fixes a bug reported by Eli Barzilay in the
interaction between autostashing, staged index entries, and
stash.index=true.
The first patch is an incidental cleanup, while the second holds the
interesting bits. Preferences on keeping or removing a few assert()
calls in merge-ort.c are welcome.
[1/2] builtin/stash: remove unused header
[2/2] builtin/stash: merge index in-core
builtin/stash.c | 77 +++++++++---------------------------------------
merge-ort.c | 3 --
t/t7600-merge.sh | 9 ++++++
3 files changed, 23 insertions(+), 66 deletions(-)
base-commit: 339ab2a8f14c0c304ae2f28df1a859f3d2cf610c
--
2.56.0.rc1.315.gc6ed9934b7.dirty
next reply other threads:[~2026-09-19 21:27 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-19 21:26 D. Ben Knoble [this message]
2026-09-19 21:26 ` [PATCH 1/2] builtin/stash: remove unused header D. Ben Knoble
2026-09-21 15:10 ` Junio C Hamano
2026-09-19 21:26 ` [PATCH 2/2] builtin/stash: merge index in-core D. Ben Knoble
2026-09-21 13:17 ` Phillip Wood
2026-09-22 12:43 ` D. Ben Knoble
2026-09-22 12:51 ` D. Ben Knoble
2026-09-22 13:57 ` Phillip Wood
2026-09-22 20:34 ` D. Ben Knoble
2026-09-19 21:32 ` [PATCH 0/2] Hi all, D. Ben Knoble
2026-09-23 12:58 ` [PATCH v2 0/4] stash: clean up index-mode test merge D. Ben Knoble
2026-09-23 12:58 ` [PATCH v2 1/4] builtin/stash: remove unused header D. Ben Knoble
2026-09-23 12:58 ` [PATCH v2 2/4] stash: prepare merge options earlier D. Ben Knoble
2026-09-23 12:58 ` [PATCH v2 3/4] t: test failed "stash apply --index" D. Ben Knoble
2026-09-24 9:42 ` Phillip Wood
2026-09-25 13:36 ` D. Ben Knoble
2026-09-25 15:45 ` Phillip Wood
2026-09-26 9:53 ` Phillip Wood
2026-09-26 12:07 ` D. Ben Knoble
2026-09-23 12:58 ` [PATCH v2 4/4] builtin/stash: merge index in-core D. Ben Knoble
2026-09-24 9:42 ` Phillip Wood
2026-09-25 12:55 ` D. Ben Knoble
2026-09-25 15:58 ` Phillip Wood
2026-09-25 16:16 ` D. Ben Knoble
2026-09-24 21:59 ` Junio C Hamano
2026-09-25 4:12 ` Junio C Hamano
2026-09-25 13:00 ` D. Ben Knoble
2026-09-25 16:24 ` Junio C Hamano
2026-09-26 9:51 ` Phillip Wood
2026-09-26 12:04 ` D. Ben Knoble
2026-09-25 16:04 ` Phillip Wood
2026-09-25 16:17 ` D. Ben Knoble
2026-09-25 16:49 ` Junio C Hamano
2026-09-26 12:16 ` [PATCH v3 0/5] stash: clean up index-mode test merge D. Ben Knoble
2026-09-26 12:16 ` [PATCH v3 1/5] builtin/stash: remove unused header D. Ben Knoble
2026-09-26 12:16 ` [PATCH v3 2/5] stash: prepare merge options earlier D. Ben Knoble
2026-09-26 12:16 ` [PATCH v3 3/5] t3903: test stash --index merges D. Ben Knoble
2026-09-28 15:44 ` Phillip Wood
2026-09-28 15:55 ` D. Ben Knoble
2026-09-29 9:41 ` Phillip Wood
2026-09-26 12:16 ` [PATCH v3 4/5] t3903: test failed "stash apply --index" D. Ben Knoble
2026-09-26 12:16 ` [PATCH v3 5/5] builtin/stash: merge index in-core D. Ben Knoble
2026-09-27 18:59 ` Junio C Hamano
2026-09-28 12:02 ` D. Ben Knoble
2026-09-28 9:40 ` Junio C Hamano
2026-09-28 12:03 ` D. Ben Knoble
2026-09-28 15:32 ` Junio C Hamano
2026-09-26 12:20 ` [PATCH v3 0/5] stash: clean up index-mode test merge D. Ben Knoble
2026-09-27 19:21 ` Junio C Hamano
2026-09-28 9:50 ` Phillip Wood
2026-09-28 12:05 ` D. Ben Knoble
2026-09-28 12:33 ` D. Ben Knoble
2026-09-28 13:00 ` D. Ben Knoble
2026-09-28 13:45 ` Phillip Wood
2026-09-28 14:50 ` Thomas Bachem
2026-09-28 15:36 ` D. Ben Knoble
2026-09-29 11:38 ` D. Ben Knoble
2026-09-29 15:54 ` Phillip Wood
2026-09-28 15:40 ` Phillip Wood
2026-09-29 12:18 ` [PATCH v4 " D. Ben Knoble
2026-09-29 12:18 ` [PATCH v4 1/5] builtin/stash: remove unused header D. Ben Knoble
2026-09-29 12:18 ` [PATCH v4 2/5] stash: prepare merge options earlier D. Ben Knoble
2026-09-29 12:18 ` [PATCH v4 3/5] t3903: test failed "stash apply --index" D. Ben Knoble
2026-09-29 12:18 ` [PATCH v4 4/5] t5520: don't expire reflogs where it matters D. Ben Knoble
2026-09-29 15:46 ` Phillip Wood
2026-09-29 12:18 ` [PATCH v4 5/5] builtin/stash: merge index in-core D. Ben Knoble
2026-09-29 20:07 ` Junio C Hamano
2026-09-30 1:29 ` D. Ben Knoble
2026-09-29 15:48 ` [PATCH v4 0/5] stash: clean up index-mode test merge Phillip Wood
2026-09-29 17:31 ` Ben Knoble
2026-09-30 21:26 ` D. Ben Knoble
2026-09-30 21:24 ` [PATCH v5 0/4] " D. Ben Knoble
2026-09-30 21:24 ` [PATCH v5 1/4] builtin/stash: remove unused header D. Ben Knoble
2026-09-30 21:24 ` [PATCH v5 2/4] stash: prepare merge options earlier D. Ben Knoble
2026-09-30 21:24 ` [PATCH v5 3/4] t3903: test failed "stash apply --index" D. Ben Knoble
2026-09-30 21:24 ` [PATCH v5 4/4] builtin/stash: merge index in-core D. Ben Knoble
2026-10-01 15:52 ` [PATCH v5 0/4] stash: clean up index-mode test merge Phillip Wood
2026-10-01 17:47 ` Junio C Hamano
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=cover.1789853192.git.ben.knoble@gmail.com \
--to=ben.knoble@gmail.com \
--cc=eli@barzilay.org \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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