Skip to content

refs: convert special refs to become normal pseudo-refs

Patrick Steinhardt git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest7 patches 15 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7sequencer: clean up pseudo refs with REF_NO_DEREFsequencer.c+7 -74 replies
2/7sequencer: delete REBASE_HEAD in correct repo when picking commitssequencer.c+2 -10 replies
3/7refs: convert AUTO_MERGE to become a normal pseudo-refbranch.c builtin/rebase.c merge-ort.c +6 more+23 -184 replies
4/7sequencer: introduce functions to handle autostashes via refssequencer.c sequencer.h+64 -54 replies
5/7refs: convert MERGE_AUTOSTASH to become a normal pseudo-refbranch.c builtin/commit.c builtin/merge.c +5 more+15 -210 replies
6/7refs: redefine special refsrefs.c+7 -261 reply
7/7Documentation: add "special refs" to the glossaryDocumentation/glossary-content.txt+14 -02 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/7] refs: convert special refs to become normal pseudo-refs

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/[email protected]/
[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

Signature · 1 line
2.43.GIT