diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-29 16:03:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-29 16:03:00 -0800 |
| commit | 8282f9592838acd265491737e4d36636fc64b639 (patch) | |
| tree | 775238c960cfb528e2ba78001e676d76d8ba39b3 /builtin/commit.c | |
| parent | Merge branch 'js/oss-fuzz-build-in-ci' (diff) | |
| parent | Documentation: add "special refs" to the glossary (diff) | |
| download | git-8282f9592838acd265491737e4d36636fc64b639.tar.gz git-8282f9592838acd265491737e4d36636fc64b639.zip | |
Merge branch 'ps/not-so-many-refs-are-special'
Define "special ref" as a very narrow set that consists of
FETCH_HEAD and MERGE_HEAD, and clarify everything else that used to
be classified as such are actually just pseudorefs.
* ps/not-so-many-refs-are-special:
Documentation: add "special refs" to the glossary
refs: redefine special refs
refs: convert MERGE_AUTOSTASH to become a normal pseudo-ref
sequencer: introduce functions to handle autostashes via refs
refs: convert AUTO_MERGE to become a normal pseudo-ref
sequencer: delete REBASE_HEAD in correct repo when picking commits
sequencer: clean up pseudo refs with REF_NO_DEREF
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 65196a2827..6d1fa71676 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1877,7 +1877,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) &oid, flags); } - apply_autostash(git_path_merge_autostash(the_repository)); + apply_autostash_ref(the_repository, "MERGE_AUTOSTASH"); cleanup: strbuf_release(&author_ident); |