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

[PATCH v6 04/32] refs: move resolve_ref_unsafe into common code

From
David Turner <dturner@twopensource.com>
Date
Feb 24, 2016, 22:58 UTC
Message-ID
<1456354744-8022-5-git-send-email-dturner@twopensource.com>
In-Reply-To
<1456354744-8022-1-git-send-email-dturner@twopensource.com>

Now that resolve_ref_unsafe's only interaction with the backend is through read_raw_ref, we can move it into the common code. Later, we'll replace read_raw_ref with a backend function.

Signed-off-by: David Turner <dturner@twopensource.com>
---
 refs.c               | 104 ++++++++++++++++++++++++++++++++++++++++++++++
 refs/files-backend.c | 115 ++-------------------------------------------------
 refs/refs-internal.h |   6 +++
 3 files changed, 114 insertions(+), 111 deletions(-)
diff --git a/refs.c b/refs.c
index c38311b..f4c0a85 100644
--- a/refs.c
+++ b/refs.c
@@ -1157,3 +1157,107 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)
 	return do_for_each_ref(NULL, "", fn, 0,
 			       DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
 }
+/* This function needs to return a meaningful errno on failure */
+static const char *resolve_ref_1(const char *refname,
+				 int resolve_flags,
+				 unsigned char *sha1,
+				 int *flags,
+				 struct strbuf *sb_refname,
+				 struct strbuf *sb_path)
+{
+	int bad_name = 0;
+	int symref_count;
+
+	if (flags)
+		*flags = 0;
+
+	if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
+		if (flags)
+			*flags |= REF_BAD_NAME;
+
+		if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
+		    !refname_is_safe(refname)) {
+			errno = EINVAL;
+			return NULL;
+		}
+		/*
+		 * dwim_ref() uses REF_ISBROKEN to distinguish between
+		 * missing refs and refs that were present but invalid,
+		 * to complain about the latter to stderr.
+		 *
+		 * We don't know whether the ref exists, so don't set
+		 * REF_ISBROKEN yet.
+		 */
+		bad_name = 1;
+	}
+
+	for (symref_count = 0; symref_count < SYMREF_MAXDEPTH; symref_count++) {
+		int read_flags = 0;
+
+		if (read_raw_ref(refname, sha1, sb_refname, sb_path, &read_flags)) {
+			int saved_errno = errno;
+			if (flags)
+				*flags |= read_flags;
+			errno = saved_errno;
+			if (bad_name) {
+				hashclr(sha1);
+				if (flags)
+					*flags |= REF_ISBROKEN;
+			}
+			if (resolve_flags & RESOLVE_REF_READING || errno != ENOENT) {
+				return NULL;
+			} else {
+				hashclr(sha1);
+				return refname;
+			}
+		}
+		if (flags)
+			*flags |= read_flags;
+
+		if (!(read_flags & REF_ISSYMREF)) {
+			if (bad_name) {
+				hashclr(sha1);
+				if (flags)
+					*flags |= REF_ISBROKEN;
+			}
+			return refname;
+		}
+
+		refname = sb_refname->buf;
+		if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
+			hashclr(sha1);
+			if (bad_name && flags)
+				*flags |= REF_ISBROKEN;
+			return refname;
+		}
+
+		if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
+			if (flags)
+				*flags |= REF_ISBROKEN;
+			if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
+			    !refname_is_safe(refname)) {
+				errno = EINVAL;
+				return NULL;
+			}
+			bad_name = 1;
+		}
+	}
+
+	if (flags)
+		*flags |= REF_ISBROKEN;
+	return NULL;
+}
+
+const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
+			       unsigned char *sha1, int *flags)
+{
+	static struct strbuf sb_refname = STRBUF_INIT;
+	struct strbuf sb_path = STRBUF_INIT;
+	const char *ret;
+
+	ret = resolve_ref_1(refname, resolve_flags, sha1, flags,
+			    &sb_refname, &sb_path);
+
+	strbuf_release(&sb_path);
+	return ret;
+}
diff --git a/refs/files-backend.c b/refs/files-backend.c
index ef5f28d..5749eff 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1277,8 +1277,6 @@ static struct ref_dir *get_loose_refs(struct ref_cache *refs)
 	return get_ref_dir(refs->loose);
 }
 
-/* We allow "recursive" symbolic refs. Only within reason, though */
-#define MAXDEPTH 5
 #define MAXREFLEN (1024)
 
 /*
@@ -1308,7 +1306,7 @@ static int resolve_gitlink_ref_recursive(struct ref_cache *refs,
 	char buffer[128], *p;
 	char *path;
 
-	if (recursion > MAXDEPTH || strlen(refname) > MAXREFLEN)
+	if (recursion > SYMREF_MAXDEPTH || strlen(refname) > MAXREFLEN)
 		return -1;
 	path = *refs->name
 		? git_pathdup_submodule(refs->name, "%s", refname)
@@ -1423,9 +1421,9 @@ static int resolve_missing_loose_ref(const char *refname,
  *
  * sb_path is workspace: the caller should allocate and free it.
  */
-static int read_raw_ref(const char *refname, unsigned char *sha1,
-			struct strbuf *symref, struct strbuf *sb_path,
-			unsigned int *flags)
+int read_raw_ref(const char *refname, unsigned char *sha1,
+		 struct strbuf *symref, struct strbuf *sb_path,
+		 unsigned int *flags)
 {
 	struct strbuf sb_contents = STRBUF_INIT;
 	int ret = -1;
@@ -1543,111 +1541,6 @@ static int read_raw_ref(const char *refname, unsigned char *sha1,
 	return ret;
 }
 
-/* This function needs to return a meaningful errno on failure */
-static const char *resolve_ref_1(const char *refname,
-				 int resolve_flags,
-				 unsigned char *sha1,
-				 int *flags,
-				 struct strbuf *sb_refname,
-				 struct strbuf *sb_path)
-{
-	int bad_name = 0;
-	int symref_count;
-
-	if (flags)
-		*flags = 0;
-
-	if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
-		if (flags)
-			*flags |= REF_BAD_NAME;
-
-		if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
-		    !refname_is_safe(refname)) {
-			errno = EINVAL;
-			return NULL;
-		}
-		/*
-		 * dwim_ref() uses REF_ISBROKEN to distinguish between
-		 * missing refs and refs that were present but invalid,
-		 * to complain about the latter to stderr.
-		 *
-		 * We don't know whether the ref exists, so don't set
-		 * REF_ISBROKEN yet.
-		 */
-		bad_name = 1;
-	}
-
-	for (symref_count = 0; symref_count < MAXDEPTH; symref_count++) {
-		int read_flags = 0;
-
-		if (read_raw_ref(refname, sha1, sb_refname, sb_path, &read_flags)) {
-			int saved_errno = errno;
-			if (flags)
-				*flags |= read_flags;
-			errno = saved_errno;
-			if (bad_name) {
-				hashclr(sha1);
-				if (flags)
-					*flags |= REF_ISBROKEN;
-			}
-			if (resolve_flags & RESOLVE_REF_READING || errno != ENOENT) {
-				return NULL;
-			} else {
-				hashclr(sha1);
-				return refname;
-			}
-		}
-		if (flags)
-			*flags |= read_flags;
-
-		if (!(read_flags & REF_ISSYMREF)) {
-			if (bad_name) {
-				hashclr(sha1);
-				if (flags)
-					*flags |= REF_ISBROKEN;
-			}
-			return refname;
-		}
-
-		refname = sb_refname->buf;
-		if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
-			hashclr(sha1);
-			if (bad_name && flags)
-				*flags |= REF_ISBROKEN;
-			return refname;
-		}
-
-		if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
-			if (flags)
-				*flags |= REF_ISBROKEN;
-			if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) ||
-			    !refname_is_safe(refname)) {
-				errno = EINVAL;
-				return NULL;
-			}
-			bad_name = 1;
-		}
-	}
-
-	if (flags)
-		*flags |= REF_ISBROKEN;
-	return NULL;
-}
-
-const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
-			       unsigned char *sha1, int *flags)
-{
-	static struct strbuf sb_refname = STRBUF_INIT;
-	struct strbuf sb_path = STRBUF_INIT;
-	const char *ret;
-
-	ret = resolve_ref_1(refname, resolve_flags, sha1, flags,
-			    &sb_refname, &sb_path);
-
-	strbuf_release(&sb_path);
-	return ret;
-}
-
 /*
  * Peel the entry (if possible) and return its new peel_status.  If
  * repeel is true, re-peel the entry even if there is an old peeled
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 92aae80..979a136 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -197,6 +197,8 @@ const char *find_descendant_ref(const char *dirname,
 
 int rename_ref_available(const char *oldname, const char *newname);
 
+/* We allow "recursive" symbolic refs. Only within reason, though */
+#define SYMREF_MAXDEPTH 5
 
 /* Include broken references in a do_for_each_ref*() iteration: */
 #define DO_FOR_EACH_INCLUDE_BROKEN 0x01
@@ -206,4 +208,8 @@ int rename_ref_available(const char *oldname, const char *newname);
  */
 int do_for_each_ref(const char *submodule, const char *base,
 		    each_ref_fn fn, int trim, int flags, void *cb_data);
+
+int read_raw_ref(const char *refname, unsigned char *sha1,
+		 struct strbuf *symref, struct strbuf *sb_path,
+		 unsigned int *flags);
 #endif /* REFS_REFS_INTERNAL_H */

-- 
2.4.2.767.g62658d5-twtrsrc
Previous: Junio C HamanoNext: Junio C Hamano
Message 9 of 56 in “refs backend”
  1. 00/32 refs backendDavid Turner, Feb 24, 2016
  2. 01/32 refs: move head_ref{,_submodule} to the common codeDavid Turner, Feb 24, 2016
  3. 02/32 refs: move for_each_*ref* functions into common codeDavid Turner, Feb 24, 2016
  4. 03/32 files-backend: break out ref readingDavid Turner, Feb 24, 2016
  5. Junio C HamanoFeb 25, 2016
  6. Junio C HamanoFeb 25, 2016
  7. David TurnerFeb 25, 2016
  8. Junio C HamanoFeb 25, 2016
  9. 04/32 refs: move resolve_ref_unsafe into common codeDavid Turner, Feb 24, 2016
  10. Junio C HamanoFeb 25, 2016
  11. 05/32 refs: add a backend method structure with transaction functionsDavid Turner, Feb 24, 2016
  12. Jeff KingFeb 27, 2016
  13. David TurnerFeb 29, 2016
  14. 06/32 refs: add methods for misc ref operationsDavid Turner, Feb 24, 2016
  15. 07/32 refs: add method for do_for_each_refDavid Turner, Feb 24, 2016
  16. 08/32 refs: reduce the visibility of do_for_each_ref()David Turner, Feb 24, 2016
  17. 09/32 refs: add do_for_each_per_worktree_refDavid Turner, Feb 24, 2016
  18. 10/32 refs: add methods for reflogDavid Turner, Feb 24, 2016
  19. 11/32 refs: add method for initial ref transaction commitDavid Turner, Feb 24, 2016
  20. 12/32 refs: add method for delete_refsDavid Turner, Feb 24, 2016
  21. 13/32 refs: add methods to init refs dbDavid Turner, Feb 24, 2016
  22. 14/32 refs: add method to rename refsDavid Turner, Feb 24, 2016
  23. 15/32 refs: handle non-normal ref renamesDavid Turner, Feb 24, 2016
  24. 16/32 refs: make lock genericDavid Turner, Feb 24, 2016
  25. 17/32 refs: move duplicate check to common codeDavid Turner, Feb 24, 2016
  26. 18/32 refs: allow log-only updatesDavid Turner, Feb 24, 2016
  27. 19/32 refs: don't dereference on renameDavid Turner, Feb 24, 2016
  28. 20/32 refs: on symref reflog expire, lock symref not referrentDavid Turner, Feb 24, 2016
  29. 21/32 refs: resolve symbolic refs firstDavid Turner, Feb 24, 2016
  30. 22/32 refs: always handle non-normal refs in files backendDavid Turner, Feb 24, 2016
  31. 23/32 init: allow alternate ref strorage to be set for new reposDavid Turner, Feb 24, 2016
  32. 24/32 refs: check submodules' ref storage configDavid Turner, Feb 24, 2016
  33. 25/32 clone: allow ref storage backend to be set for cloneDavid Turner, Feb 24, 2016
  34. 26/32 svn: learn ref-storage argumentDavid Turner, Feb 24, 2016
  35. 27/32 refs: register ref storage backendsDavid Turner, Feb 24, 2016
  36. 28/32 config: read ref storage config on startupDavid Turner, Feb 24, 2016
  37. Jeff KingFeb 27, 2016
  38. Jeff KingFeb 27, 2016
  39. David TurnerFeb 29, 2016
  40. Jeff KingFeb 29, 2016
  41. David TurnerFeb 29, 2016
  42. Jeff KingFeb 29, 2016
  43. Jeff KingFeb 29, 2016
  44. David TurnerFeb 29, 2016
  45. 29/32 refs: break out resolve_ref_unsafe_submoduleDavid Turner, Feb 24, 2016
  46. 30/32 refs: add LMDB refs storage backendDavid Turner, Feb 24, 2016
  47. 31/32 refs: tests for lmdb backendDavid Turner, Feb 24, 2016
  48. 32/32 tests: add ref-storage argumentDavid Turner, Feb 24, 2016
  49. SZEDER GáborFeb 29, 2016
  50. David TurnerFeb 29, 2016
  51. Ramsay JonesFeb 25, 2016
  52. David TurnerFeb 25, 2016
  53. Duy NguyenFeb 25, 2016
  54. David TurnerFeb 25, 2016
  55. Stefan BellerFeb 25, 2016
  56. Duy NguyenFeb 25, 2016

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.