From: "Han-Wen Nienhuys via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Han-Wen Nienhuys <hanwenn@gmail.com>
Subject: [PATCH 0/2] Prepare (auto)stash for reftable
Date: Tue, 08 Feb 2022 20:09:43 +0000 [thread overview]
Message-ID: <pull.1214.git.git.1644350985.gitgitgadget@gmail.com> (raw)
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
next reply other threads:[~2022-02-08 22:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-08 20:09 Han-Wen Nienhuys via GitGitGadget [this message]
2022-02-08 20:09 ` [PATCH 1/2] t3420: prepare for reftable Han-Wen Nienhuys via GitGitGadget
2022-02-08 20:09 ` [PATCH 2/2] Treat MERGE_AUTOSTASH and friends as a pseudoref Han-Wen Nienhuys via GitGitGadget
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1214.git.git.1644350985.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=hanwenn@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).