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

Re: [PATCH v2 31/39] bundle: add new version for use with SHA-256

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jul 15, 2020, 19:42 UTC
Message-ID
<nycvar.QRO.7.76.6.2007152141160.52@tvgsbejvaqbjf.bet>
In-Reply-To
<20200713155617.GF11341@szeder.dev>
Hi,
On Mon, 13 Jul 2020, SZEDER Gábor wrote:
Show 36 quoted lines
> On Mon, Jul 13, 2020 at 02:49:01AM +0000, brian m. carlson wrote:
> > @@ -23,17 +24,20 @@ static void add_to_ref_list(const struct object_id *oid, const char *name,
> >  	list->nr++;
> >  }
> >
> > -static const struct git_hash_algo *detect_hash_algo(struct strbuf *buf)
> > +static int parse_capability(struct bundle_header *header, const char *capability)
> >  {
> > -	size_t len = strcspn(buf->buf, " \n");
> > -	int algo;
> > -
> > -	algo = hash_algo_by_length(len / 2);
> > -	if (algo == GIT_HASH_UNKNOWN)
> > -		return NULL;
> > -	return &hash_algos[algo];
> > +	const char *arg;
> > +	if (skip_prefix(capability, "object-format=", &arg)) {
> > +		int algo = hash_algo_by_name(arg);
> > +		if (algo == GIT_HASH_UNKNOWN)
> > +			return error(_("unable to detect hash algorithm"));
> > +		header->hash_algo = &hash_algos[algo];
> > +		return 0;
> > +	}
> > +	return error(_("unknown capability '%s'"), capability);
> >  }
>
>
> > +test_expect_success 'git bundle v3 rejects unknown extensions' '
> > +	head -n2 bundle >new &&
> > +	echo "@unknown=silly" >>new &&
> > +	sed "1,2d" >>new &&
> > +	test_must_fail git bundle verify new 2>output &&
> > +	grep "unknown capability .unknown=silly." output
>
> This "unknown capability" error message is translated, so it should be
> checked with 'test_i18ngrep'.
In other words, this patch (which makes things work over here):
-- snipsnap --
Subject: [PATCH] fixup! bundle: add new version for use with SHA-256
---
 t/t5607-clone-bundle.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index 4a2a3968cc1..ca4efd88d4a 100755
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -118,7 +118,7 @@ test_expect_success 'git bundle v3 rejects unknown extensions' '
 	echo "@unknown=silly" >>new &&
 	sed "1,2d" >>new &&
 	test_must_fail git bundle verify new 2>output &&
-	grep "unknown capability .unknown=silly." output
+	test_i18ngrep "unknown capability .unknown=silly." output
 '

 test_done
--
2.26.0.windows.1
Previous: SZEDER GáborNext: Junio C Hamano
Message 42 of 44 in “SHA-256, part 3/3”
  1. 00/39 SHA-256, part 3/3brian m. carlson, Jul 13, 2020
  2. 01/39 t: make test-bloom initialize repositorybrian m. carlson, Jul 13, 2020
  3. 09/39 t6501: avoid hard-coded objectsbrian m. carlson, Jul 13, 2020
  4. 10/39 t7003: compute appropriate length constantbrian m. carlson, Jul 13, 2020
  5. 14/39 t7400: make hash size independentbrian m. carlson, Jul 13, 2020
  6. 06/39 t6101: make hash size independentbrian m. carlson, Jul 13, 2020
  7. 18/39 t8002: make hash size independentbrian m. carlson, Jul 13, 2020
  8. 11/39 t7063: make hash size independentbrian m. carlson, Jul 13, 2020
  9. 17/39 t7508: use $ZERO_OID instead of hard-coded constantbrian m. carlson, Jul 13, 2020
  10. 16/39 t7506: avoid checking for SHA-1-specific constantsbrian m. carlson, Jul 13, 2020
  11. 12/39 t7201: abstract away SHA-1-specific constantsbrian m. carlson, Jul 13, 2020
  12. 02/39 t1001: use $ZERO_OIDbrian m. carlson, Jul 13, 2020
  13. 21/39 t9300: abstract away SHA-1-specific constantsbrian m. carlson, Jul 13, 2020
  14. 22/39 t9300: use $ZERO_OID instead of hard-coded object IDbrian m. carlson, Jul 13, 2020
  15. 19/39 t8003: make hash size independentbrian m. carlson, Jul 13, 2020
  16. 37/39 ci: run tests with SHA-256brian m. carlson, Jul 13, 2020
  17. 38/39 docs: add documentation for extensions.objectFormatbrian m. carlson, Jul 13, 2020
  18. 39/39 t: remove test_oid_init in testsbrian m. carlson, Jul 13, 2020
  19. 07/39 t6301: make hash size independentbrian m. carlson, Jul 13, 2020
  20. 03/39 t3305: make hash agnosticbrian m. carlson, Jul 13, 2020
  21. 05/39 t6100: make hash size independentbrian m. carlson, Jul 13, 2020
  22. 04/39 t3404: prepare 'short SHA-1 collision' tests for SHA-256brian m. carlson, Jul 13, 2020
  23. 34/39 t: add test_oid option to select hash algorithmbrian m. carlson, Jul 13, 2020
  24. 29/39 http-fetch: set up git directory before parsing pack hashesbrian m. carlson, Jul 13, 2020
  25. 08/39 t6500: specify test values for SHA-256brian m. carlson, Jul 13, 2020
  26. 15/39 t7405: make hash size independentbrian m. carlson, Jul 13, 2020
  27. 33/39 Enable SHA-256 support by defaultbrian m. carlson, Jul 13, 2020
  28. 13/39 t7102: abstract away SHA-1-specific constantsbrian m. carlson, Jul 13, 2020
  29. 24/39 t9350: make hash size independentbrian m. carlson, Jul 13, 2020
  30. 25/39 t9500: ensure that algorithm info is preserved in configbrian m. carlson, Jul 13, 2020
  31. 20/39 t8011: make hash size independentbrian m. carlson, Jul 13, 2020
  32. 26/39 t9700: make hash size independentbrian m. carlson, Jul 13, 2020
  33. 27/39 t5308: make test work with SHA-256brian m. carlson, Jul 13, 2020
  34. 28/39 t0410: mark test with SHA1 prerequisitebrian m. carlson, Jul 13, 2020
  35. 35/39 t: allow testing different hash algorithms via environmentbrian m. carlson, Jul 13, 2020
  36. 36/39 t: make SHA1 prerequisite depend on default hashbrian m. carlson, Jul 13, 2020
  37. 32/39 setup: add support for reading extensions.objectformatbrian m. carlson, Jul 13, 2020
  38. 30/39 builtin/verify-pack: implement an --object-format optionbrian m. carlson, Jul 13, 2020
  39. 31/39 bundle: add new version for use with SHA-256brian m. carlson, Jul 13, 2020
  40. Junio C HamanoJul 13, 2020
  41. SZEDER GáborJul 13, 2020
  42. Johannes SchindelinJul 15, 2020
  43. Junio C HamanoJul 15, 2020
  44. 23/39 t9301: make hash size independentbrian m. carlson, Jul 13, 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.