Stashes are stored as hex OIDs in files under .git/ but are accessed as refs. This series consistently treats stashes (AUTOMERGE_STASH, rebase-merge/autostash etc.) as refs. Han-Wen Nienhuys (2): t3420: prepare for reftable Treat MERGE_AUTOSTASH and friends as a pseudoref branch.c | 2 +- builtin/commit.c | 2 +- builtin/merge.c | 29 +++++++++++------------ builtin/rebase.c | 34 ++++++++++++++++++++++----- path.c | 1 - path.h | 3 +-- sequencer.c | 46 +++++++++++++++++-------------------- t/t3420-rebase-autostash.sh | 31 +++++++++++++------------ 8 files changed, 82 insertions(+), 66 deletions(-) base-commit: a9cd6a0c5981a7d3c9865cf1966243c82f93e58e Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1214%2Fhanwen%2Freftable-stash-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1214/hanwen/reftable-stash-v1 Pull-Request: https://github.com/git/git/pull/1214 -- gitgitgadget