[PATCH 0/2] Hi all,

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