From fd7c6ffa9e118cdf18a3752ec456070ed0a22e3b Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 19 Jan 2024 11:40:09 +0100 Subject: refs: convert AUTO_MERGE to become a normal pseudo-ref In 70c70de616 (refs: complete list of special refs, 2023-12-14) we have inrtoduced a new `is_special_ref()` function that classifies some refs as being special. The rule is that special refs are exclusively read and written via the filesystem directly, whereas normal refs exclucsively go via the refs API. The intent of that commit was to record the status quo so that we know to route reads of such special refs consistently. Eventually, the list should be reduced to its bare minimum of refs which really are special, namely FETCH_HEAD and MERGE_HEAD. Follow up on this promise and convert the AUTO_MERGE ref to become a normal pseudo-ref by using the refs API to both read and write it instead of accessing the filesystem directly. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano --- path.h | 1 - 1 file changed, 1 deletion(-) (limited to 'path.h') diff --git a/path.h b/path.h index 639372edd9..f387410f8c 100644 --- a/path.h +++ b/path.h @@ -176,7 +176,6 @@ const char *git_path_merge_rr(struct repository *r); const char *git_path_merge_mode(struct repository *r); const char *git_path_merge_head(struct repository *r); const char *git_path_merge_autostash(struct repository *r); -const char *git_path_auto_merge(struct repository *r); const char *git_path_fetch_head(struct repository *r); const char *git_path_shallow(struct repository *r); -- cgit v1.2.3