Hi, this patch series is a follow-up to the one that introduced `is_special_ref()` [1]. Back then, we agreed that the list of special refs ought to shrink over time [2] so that only the actually-special refs FETCH_HEAD and MERGE_HEAD remain, which is exactly what I'm doing now. Patrick [1]: https://public-inbox.org/git/cover.1701243201.git.ps@xxxxxx/ [2]: https://public-inbox.org/git/ZXlfeWtDgr1GQFCL@tanuki/ Patrick Steinhardt (7): sequencer: clean up pseudo refs with REF_NO_DEREF sequencer: delete REBASE_HEAD in correct repo when picking commits refs: convert AUTO_MERGE to become a normal pseudo-ref sequencer: introduce functions to handle autostashes via refs refs: convert MERGE_AUTOSTASH to become a normal pseudo-ref refs: redefine special refs Documentation: add "special refs" to the glossary Documentation/glossary-content.txt | 14 +++++ branch.c | 5 +- builtin/commit.c | 2 +- builtin/merge.c | 27 ++++----- builtin/rebase.c | 2 +- merge-ort.c | 19 +++--- path.c | 2 - path.h | 2 - refs.c | 35 +++-------- repository.c | 2 - repository.h | 2 - sequencer.c | 95 ++++++++++++++++++++++++------ sequencer.h | 3 + 13 files changed, 132 insertions(+), 78 deletions(-) base-commit: 186b115d3062e6230ee296d1ddaa0c4b72a464b5 -- 2.43.GIT
Attachment:
signature.asc
Description: PGP signature
