diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-08-31 15:49:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-31 15:49:48 -0700 |
| commit | e699684cf6bdfd4d6fd9086a6935168f86a0177e (patch) | |
| tree | 1cea1c4b68f829b39d6bf281aac992a7e1e227f7 /path.c | |
| parent | Merge branch 'jk/index-pack-w-more-threads' (diff) | |
| parent | sequencer: treat REVERT_HEAD as a pseudo ref (diff) | |
| download | tgif-e699684cf6bdfd4d6fd9086a6935168f86a0177e.tar.xz | |
Merge branch 'hn/refs-pseudorefs'
Accesses to two pseudorefs have been updated to properly use ref
API.
* hn/refs-pseudorefs:
sequencer: treat REVERT_HEAD as a pseudo ref
builtin/commit: suggest update-ref for pseudoref removal
sequencer: treat CHERRY_PICK_HEAD as a pseudo ref
refs: make refs_ref_exists public
Diffstat (limited to 'path.c')
| -rw-r--r-- | path.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -1528,8 +1528,6 @@ char *xdg_cache_home(const char *filename) return NULL; } -REPO_GIT_PATH_FUNC(cherry_pick_head, "CHERRY_PICK_HEAD") -REPO_GIT_PATH_FUNC(revert_head, "REVERT_HEAD") REPO_GIT_PATH_FUNC(squash_msg, "SQUASH_MSG") REPO_GIT_PATH_FUNC(merge_msg, "MERGE_MSG") REPO_GIT_PATH_FUNC(merge_rr, "MERGE_RR") |