git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 4/4] refs: read FETCH_HEAD generically

From
Han-Wen Nienhuys via GitGitGadget <gitgitgadget@gmail.com>
Date
Aug 17, 2020, 15:39 UTC
Message-ID
<d4e9c5f4996640e71ea47cb65867c4553bdf8f42.1597678796.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.705.git.1597678796.gitgitgadget@gmail.com>
From: Han-Wen Nienhuys <hanwen@google.com>

The FETCH_HEAD ref must be stored in a file, regardless of the type of ref backend. This is because it can hold more than just a single ref.

To accomodate FETCH_HEAD for alternate ref backends, read FETCH_HEAD from a file generically in refs_read_raw_ref()

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
---
 refs.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/refs.c b/refs.c
index 2dd851fe81..ab7d62e237 100644
--- a/refs.c
+++ b/refs.c
@@ -1634,11 +1634,36 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)
 	return refs_for_each_rawref(get_main_ref_store(the_repository), fn, cb_data);
 }
 
+static int refs_read_fetch_head(struct ref_store *ref_store,
+				struct object_id *oid, struct strbuf *referent,
+				unsigned int *type)
+{
+	struct strbuf full_path = STRBUF_INIT;
+	struct strbuf content = STRBUF_INIT;
+	int result = -1;
+	strbuf_addf(&full_path, "%s/%s", ref_store->gitdir, "FETCH_HEAD");
+
+	if (strbuf_read_file(&content, full_path.buf, 0) < 0)
+		goto done;
+
+	result = parse_loose_ref_contents(content.buf, oid, referent, type);
+
+done:
+	strbuf_release(&full_path);
+	strbuf_release(&content);
+	return result;
+}
+
 int refs_read_raw_ref(struct ref_store *ref_store,
 		      const char *refname, struct object_id *oid,
 		      struct strbuf *referent, unsigned int *type)
 {
-	return ref_store->be->read_raw_ref(ref_store, refname, oid, referent, type);
+	if (!strcmp(refname, "FETCH_HEAD")) {
+		return refs_read_fetch_head(ref_store, oid, referent, type);
+	}
+
+	return ref_store->be->read_raw_ref(ref_store, refname, oid, referent,
+					   type);
 }
 
 /* This function needs to return a meaningful errno on failure */
-- 
gitgitgadget
Previous: Han-Wen Nienhuys via GitGitGadgetNext: Junio C Hamano
Message 5 of 12 in “Handle FETCH_HEAD generically”
  1. 0/4 Handle FETCH_HEAD genericallyHan-Wen Nienhuys via GitGitGadget, Aug 17, 2020
  2. 1/4 Split off reading loose ref data in separate functionHan-Wen Nienhuys via GitGitGadget, Aug 17, 2020
  3. 2/4 refs: fix comment about submodule ref_storesHan-Wen Nienhuys via GitGitGadget, Aug 17, 2020
  4. 3/4 refs: move gitdir into base ref_storeHan-Wen Nienhuys via GitGitGadget, Aug 17, 2020
  5. 4/4 refs: read FETCH_HEAD genericallyHan-Wen Nienhuys via GitGitGadget, Aug 17, 2020
  6. Junio C HamanoAug 17, 2020
  7. 0/4 Handle FETCH_HEAD and MERGE_HEAD genericallyHan-Wen Nienhuys via GitGitGadget, Aug 19, 2020
  8. 2/4 refs: fix comment about submodule ref_storesHan-Wen Nienhuys via GitGitGadget, Aug 19, 2020
  9. 3/4 refs: move gitdir into base ref_storeHan-Wen Nienhuys via GitGitGadget, Aug 19, 2020
  10. 4/4 refs: read FETCH_HEAD and MERGE_HEAD genericallyHan-Wen Nienhuys via GitGitGadget, Aug 19, 2020
  11. 1/4 refs: split off reading loose ref data in separate functionHan-Wen Nienhuys via GitGitGadget, Aug 19, 2020
  12. Junio C HamanoAug 19, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.