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

[PATCH v3 32/39] setup: add support for reading extensions.objectformat

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Jul 23, 2020, 01:09 UTC
Message-ID
<20200723010943.2329634-33-sandals@crustytoothpaste.net>
In-Reply-To
<20200723010943.2329634-1-sandals@crustytoothpaste.net>

The transition plan specifies extensions.objectFormat as the indication that we're using a given hash in a certain repo. Read this as one of the extensions we support. If the user has specified an invalid value, fail.

Ensure that we reject the extension if the repository format version is 0.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 setup.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/setup.c b/setup.c
index 3a81307602..94e68bb4f4 100644
--- a/setup.c
+++ b/setup.c
@@ -470,7 +470,16 @@ static int check_repo_format(const char *var, const char *value, void *vdata)
 			data->partial_clone = xstrdup(value);
 		} else if (!strcmp(ext, "worktreeconfig"))
 			data->worktree_config = git_config_bool(var, value);
-		else
+		else if (!strcmp(ext, "objectformat")) {
+			int format;
+
+			if (!value)
+				return config_error_nonbool(var);
+			format = hash_algo_by_name(value);
+			if (format == GIT_HASH_UNKNOWN)
+				return error("invalid value for 'extensions.objectformat'");
+			data->hash_algo = format;
+		} else
 			string_list_append(&data->unknown_extensions, ext);
 	}
 
@@ -613,6 +622,11 @@ int verify_repository_format(const struct repository_format *format,
 		return -1;
 	}
 
+	if (format->version <= 0 && format->hash_algo != GIT_HASH_SHA1) {
+		strbuf_addstr(err, _("extensions.objectFormat is not valid in repo v0"));
+		return -1;
+	}
+
 	return 0;
 }
 
Previous: brian m. carlsonNext: Junio C Hamano
Message 21 of 52 in “SHA-256, part 3/3”
  1. 00/39 SHA-256, part 3/3brian m. carlson, Jul 23, 2020
  2. 02/39 t1001: use $ZERO_OIDbrian m. carlson, Jul 23, 2020
  3. 03/39 t3305: make hash agnosticbrian m. carlson, Jul 23, 2020
  4. 14/39 t7400: make hash size independentbrian m. carlson, Jul 23, 2020
  5. 05/39 t6100: make hash size independentbrian m. carlson, Jul 23, 2020
  6. 19/39 t8003: make hash size independentbrian m. carlson, Jul 23, 2020
  7. 18/39 t8002: make hash size independentbrian m. carlson, Jul 23, 2020
  8. 22/39 t9300: use $ZERO_OID instead of hard-coded object IDbrian m. carlson, Jul 23, 2020
  9. 23/39 t9301: make hash size independentbrian m. carlson, Jul 23, 2020
  10. 26/39 t9700: make hash size independentbrian m. carlson, Jul 23, 2020
  11. 25/39 t9500: ensure that algorithm info is preserved in configbrian m. carlson, Jul 23, 2020
  12. 24/39 t9350: make hash size independentbrian m. carlson, Jul 23, 2020
  13. 30/39 builtin/verify-pack: implement an --object-format optionbrian m. carlson, Jul 23, 2020
  14. Eric SunshineJul 23, 2020
  15. 31/39 bundle: add new version for use with SHA-256brian m. carlson, Jul 23, 2020
  16. Eric SunshineJul 23, 2020
  17. Eric SunshineJul 23, 2020
  18. brian m. carlsonJul 24, 2020
  19. 38/39 docs: add documentation for extensions.objectFormatbrian m. carlson, Jul 23, 2020
  20. 37/39 ci: run tests with SHA-256brian m. carlson, Jul 23, 2020
  21. 32/39 setup: add support for reading extensions.objectformatbrian m. carlson, Jul 23, 2020
  22. Junio C HamanoJul 23, 2020
  23. brian m. carlsonJul 23, 2020
  24. Junio C HamanoJul 23, 2020
  25. brian m. carlsonJul 25, 2020
  26. 33/39 Enable SHA-256 support by defaultbrian m. carlson, Jul 23, 2020
  27. 39/39 t: remove test_oid_init in testsbrian m. carlson, Jul 23, 2020
  28. 20/39 t8011: make hash size independentbrian m. carlson, Jul 23, 2020
  29. 29/39 http-fetch: set up git directory before parsing pack hashesbrian m. carlson, Jul 23, 2020
  30. 08/39 t6500: specify test values for SHA-256brian m. carlson, Jul 23, 2020
  31. 13/39 t7102: abstract away SHA-1-specific constantsbrian m. carlson, Jul 23, 2020
  32. 11/39 t7063: make hash size independentbrian m. carlson, Jul 23, 2020
  33. 04/39 t3404: prepare 'short SHA-1 collision' tests for SHA-256brian m. carlson, Jul 23, 2020
  34. 06/39 t6101: make hash size independentbrian m. carlson, Jul 23, 2020
  35. 09/39 t6501: avoid hard-coded objectsbrian m. carlson, Jul 23, 2020
  36. 01/39 t: make test-bloom initialize repositorybrian m. carlson, Jul 23, 2020
  37. 12/39 t7201: abstract away SHA-1-specific constantsbrian m. carlson, Jul 23, 2020
  38. 17/39 t7508: use $ZERO_OID instead of hard-coded constantbrian m. carlson, Jul 23, 2020
  39. 10/39 t7003: compute appropriate length constantbrian m. carlson, Jul 23, 2020
  40. 07/39 t6301: make hash size independentbrian m. carlson, Jul 23, 2020
  41. 21/39 t9300: abstract away SHA-1-specific constantsbrian m. carlson, Jul 23, 2020
  42. 16/39 t7506: avoid checking for SHA-1-specific constantsbrian m. carlson, Jul 23, 2020
  43. 15/39 t7405: make hash size independentbrian m. carlson, Jul 23, 2020
  44. 34/39 t: add test_oid option to select hash algorithmbrian m. carlson, Jul 23, 2020
  45. Eric SunshineJul 23, 2020
  46. brian m. carlsonJul 23, 2020
  47. Eric SunshineJul 23, 2020
  48. Junio C HamanoJul 24, 2020
  49. 35/39 t: allow testing different hash algorithms via environmentbrian m. carlson, Jul 23, 2020
  50. 36/39 t: make SHA1 prerequisite depend on default hashbrian m. carlson, Jul 23, 2020
  51. 27/39 t5308: make test work with SHA-256brian m. carlson, Jul 23, 2020
  52. 28/39 t0410: mark test with SHA1 prerequisitebrian m. carlson, Jul 23, 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.