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

Re: [PATCH v5 5/5] builtin/merge-tree.c: implement support for `--write-pack`

From
Taylor Blau <me@ttaylorr.com>
Date
Oct 25, 2023, 15:46 UTC
Message-ID
<ZTk4Oz0ETcEMSgan@nand.local>
In-Reply-To
<ZTjKk8E55M7lQN1m@tanuki>
On Wed, Oct 25, 2023 at 09:58:11AM +0200, Patrick Steinhardt wrote:
Show 26 quoted lines
> > +test_expect_success 'merge-tree can pack its result with --write-pack' '
> > +	test_when_finished "rm -rf repo" &&
> > +	git init repo &&
> > +
> > +	# base has lines [3, 4, 5]
> > +	#   - side adds to the beginning, resulting in [1, 2, 3, 4, 5]
> > +	#   - other adds to the end, resulting in [3, 4, 5, 6, 7]
> > +	#
> > +	# merging the two should result in a new blob object containing
> > +	# [1, 2, 3, 4, 5, 6, 7], along with a new tree.
> > +	test_commit -C repo base file "$(test_seq 3 5)" &&
> > +	git -C repo branch -M main &&
> > +	git -C repo checkout -b side main &&
> > +	test_commit -C repo side file "$(test_seq 1 5)" &&
> > +	git -C repo checkout -b other main &&
> > +	test_commit -C repo other file "$(test_seq 3 7)" &&
> > +
> > +	find repo/$packdir -type f -name "pack-*.idx" >packs.before &&
> > +	tree="$(git -C repo merge-tree --write-pack \
> > +		refs/tags/side refs/tags/other)" &&
> > +	blob="$(git -C repo rev-parse $tree:file)" &&
> > +	find repo/$packdir -type f -name "pack-*.idx" >packs.after &&
>
> While we do assert that we write a new packfile, we don't assert whether
> parts of the written object may have been written as loose objects. Do
> we want to tighten the checks to verify that?

We could, but the tests in t1050 already verify this, so I'm not sure that we would be significantly hardening our test coverage here. If you feel strongly about it, though, I'm happy to change it up.

Thanks, Taylor

Previous: Patrick SteinhardtNext: Elijah Newren
Message 34 of 63 in “merge-ort: implement support for packing objects together”
  1. 0/7 merge-ort: implement support for packing objects togetherTaylor Blau, Oct 19, 2023
  2. 1/7 bulk-checkin: extract abstract `bulk_checkin_source`Taylor Blau, Oct 19, 2023
  3. Jeff KingOct 20, 2023
  4. Junio C HamanoOct 20, 2023
  5. 2/7 bulk-checkin: generify `stream_blob_to_pack()` for arbitrary typesTaylor Blau, Oct 19, 2023
  6. 3/7 bulk-checkin: refactor deflate routine to accept a `bulk_checkin_source`Taylor Blau, Oct 19, 2023
  7. 4/7 bulk-checkin: implement `SOURCE_INCORE` mode for `bulk_checkin_source`Taylor Blau, Oct 19, 2023
  8. Patrick SteinhardtOct 23, 2023
  9. Jeff KingOct 23, 2023
  10. Patrick SteinhardtOct 24, 2023
  11. Junio C HamanoOct 24, 2023
  12. 5/7 bulk-checkin: introduce `index_blob_bulk_checkin_incore()`Taylor Blau, Oct 19, 2023
  13. 6/7 bulk-checkin: introduce `index_tree_bulk_checkin_incore()`Taylor Blau, Oct 19, 2023
  14. 7/7 builtin/merge-tree.c: implement support for `--write-pack`Taylor Blau, Oct 19, 2023
  15. Junio C HamanoOct 19, 2023
  16. Jeff KingOct 20, 2023
  17. Junio C HamanoOct 20, 2023
  18. Patrick SteinhardtOct 23, 2023
  19. 0/5 merge-ort: implement support for packing objects togetherTaylor Blau, Oct 23, 2023
  20. 1/5 bulk-checkin: extract abstract `bulk_checkin_source`Taylor Blau, Oct 23, 2023
  21. Jeff KingOct 25, 2023
  22. Taylor BlauOct 25, 2023
  23. Junio C HamanoOct 27, 2023
  24. 2/5 bulk-checkin: generify `stream_blob_to_pack()` for arbitrary typesTaylor Blau, Oct 23, 2023
  25. 3/5 bulk-checkin: introduce `index_blob_bulk_checkin_incore()`Taylor Blau, Oct 23, 2023
  26. Patrick SteinhardtOct 25, 2023
  27. Taylor BlauOct 25, 2023
  28. Eric SunshineOct 25, 2023
  29. Patrick SteinhardtOct 26, 2023
  30. Elijah NewrenNov 11, 2023
  31. 4/5 bulk-checkin: introduce `index_tree_bulk_checkin_incore()`Taylor Blau, Oct 23, 2023
  32. 5/5 builtin/merge-tree.c: implement support for `--write-pack`Taylor Blau, Oct 23, 2023
  33. Patrick SteinhardtOct 25, 2023
  34. Taylor BlauOct 25, 2023
  35. Elijah NewrenNov 10, 2023
  36. Junio C HamanoNov 11, 2023
  37. Taylor BlauNov 11, 2023
  38. Taylor BlauNov 11, 2023
  39. Jeff KingNov 13, 2023
  40. Junio C HamanoNov 14, 2023
  41. Elijah NewrenNov 14, 2023
  42. Jeff KingNov 14, 2023
  43. Elijah NewrenNov 14, 2023
  44. Jeff KingNov 13, 2023
  45. Taylor BlauNov 13, 2023
  46. Elijah NewrenNov 14, 2023
  47. Jeff KingNov 14, 2023
  48. Jeff KingNov 14, 2023
  49. Junio C HamanoOct 23, 2023
  50. Johannes SchindelinNov 6, 2023
  51. Junio C HamanoNov 6, 2023
  52. Jeff KingNov 7, 2023
  53. Taylor BlauNov 7, 2023
  54. 0/3 replay: implement support for writing new objects to a packTaylor Blau, Nov 7, 2023
  55. 1/3 merge-ort.c: finalize ODB transactions after each stepTaylor Blau, Nov 7, 2023
  56. Elijah NewrenNov 11, 2023
  57. 2/3 tmp-objdir: introduce `tmp_objdir_repack()`Taylor Blau, Nov 7, 2023
  58. Patrick SteinhardtNov 8, 2023
  59. Taylor BlauNov 9, 2023
  60. 3/3 builtin/replay.c: introduce `--write-pack`Taylor Blau, Nov 7, 2023
  61. Elijah NewrenNov 11, 2023
  62. Elijah NewrenNov 11, 2023
  63. Patrick SteinhardtOct 25, 2023

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.