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.h | |
| parent | 53015c9dd40e0a5afc14aeeb6e6def25f10fff4d (diff) | |
| parent | b8825ef233840136bd01a9619b36af515f498eb2 (diff) | |
| download | git-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.h')
| -rw-r--r-- | path.h | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -170,8 +170,6 @@ void report_linked_checkout_garbage(void); } struct path_cache { - const char *cherry_pick_head; - const char *revert_head; const char *squash_msg; const char *merge_msg; const char *merge_rr; @@ -182,10 +180,11 @@ struct path_cache { const char *shallow; }; -#define PATH_CACHE_INIT { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } +#define PATH_CACHE_INIT \ + { \ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \ + } -const char *git_path_cherry_pick_head(struct repository *r); -const char *git_path_revert_head(struct repository *r); const char *git_path_squash_msg(struct repository *r); const char *git_path_merge_msg(struct repository *r); const char *git_path_merge_rr(struct repository *r); |
