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

Re: [PATCH 0/4] un-breaking pack-objects with bitmaps

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Sep 8, 2018, 06:43 UTC
Message-ID
<87d0toqyj6.fsf@evledraar.gmail.com>
In-Reply-To
<20180901074145.GA24023@sigill.intra.peff.net>
On Sat, Sep 01 2018, Jeff King wrote:
Show 28 quoted lines
> On Fri, Aug 31, 2018 at 06:55:58PM -0400, Jeff King wrote:
>
>> On Fri, Aug 31, 2018 at 05:23:17PM +0200, Ævar Arnfjörð Bjarmason wrote:
>>
>> > On Tue, Aug 21 2018, Jeff King wrote:
>> >
>> > > +int bitmap_has_sha1_in_uninteresting(struct bitmap_index *bitmap_git,
>> > > +				     const unsigned char *sha1)
>> > > +{
>> > > +	int pos;
>> > > +
>> > > +	if (!bitmap_git)
>> > > +		return 0; /* no bitmap loaded */
>> > > +	if (!bitmap_git->result)
>> > > +		BUG("failed to perform bitmap walk before querying");
>> >
>> > Some part of what calls this completely breaks pushing from the "next"
>> > branch when you have local bitmaps (we *really* should have some tests
>> > for this...).
>>
>> Yikes, thanks for reporting. I agree we need better tests here.
>
> OK, here is the fix. Since the problem is in 'next', this is done as a
> patch on top of jk/pack-delta-reuse-with-bitmap. But since we're set to
> rewind 'next' post-release anyway, we could squash it directly into
> 30cdc33fba from the original series. That would help later bisections
> from running into it, which may be worth it as it's a pretty severe
> breakage.  Or maybe not:
Junio: Just a reminder that next is still broken with this, and I see
e.g. the Debian "experimental" has the bug but not the fix at this
point.

I'm just reverting jk/pack-delta-reuse-with-bitmap out of next when building my own package of git, but I think this really should be fixed in that branch, either by merging the fix down or reverting the original series out of next, I think just merging the fix down makes sense, but have no strong opinion on it.

Previous: Jeff KingNext: Junio C Hamano
Message 28 of 53 in “test-tool.h: include git-compat-util.h”
  1. test-tool.h: include git-compat-util.hJeff King, Aug 21, 2018
  2. Junio C HamanoAug 21, 2018
  3. 1/6 t/perf: factor boilerplate out of test_perfJeff King, Aug 21, 2018
  4. 2/6 t/perf: factor out percent calculationsJeff King, Aug 21, 2018
  5. 3/6 t/perf: add infrastructure for measuring sizesJeff King, Aug 21, 2018
  6. Derrick StoleeAug 22, 2018
  7. Jeff KingAug 22, 2018
  8. 4/6 t/perf: add perf tests for fetches from a bitmapped serverJeff King, Aug 21, 2018
  9. 5/6 pack-bitmap: save "have" bitmap from walkJeff King, Aug 21, 2018
  10. Derrick StoleeAug 21, 2018
  11. Jeff KingAug 21, 2018
  12. Ævar Arnfjörð BjarmasonAug 31, 2018
  13. Jeff KingAug 31, 2018
  14. 0/4 un-breaking pack-objects with bitmapsJeff King, Sep 1, 2018
  15. 1/4 bitmap_has_sha1_in_uninteresting(): drop BUG checkJeff King, Sep 1, 2018
  16. 2/4 t5310: test delta reuse with bitmapsJeff King, Sep 1, 2018
  17. Jeff KingSep 1, 2018
  18. Ævar Arnfjörð BjarmasonSep 1, 2018
  19. Ben PeartSep 1, 2018
  20. Jeff KingSep 2, 2018
  21. Stefan BellerSep 4, 2018
  22. Junio C HamanoSep 4, 2018
  23. Jeff KingSep 4, 2018
  24. 3/4 traverse_bitmap_commit_list(): don't free resultJeff King, Sep 1, 2018
  25. 4/4 pack-bitmap: drop "loaded" flagJeff King, Sep 1, 2018
  26. Stefan BellerSep 4, 2018
  27. Jeff KingSep 4, 2018
  28. Ævar Arnfjörð BjarmasonSep 8, 2018
  29. Junio C HamanoSep 10, 2018
  30. Jeff KingSep 10, 2018
  31. Junio C HamanoSep 10, 2018
  32. 6/6 pack-objects: reuse on-disk deltas for thin "have" objectsJeff King, Aug 21, 2018
  33. Junio C HamanoAug 21, 2018
  34. Junio C HamanoAug 21, 2018
  35. Jeff KingAug 21, 2018
  36. Jeff KingAug 21, 2018
  37. Junio C HamanoAug 21, 2018
  38. Jeff KingAug 21, 2018
  39. Junio C HamanoAug 21, 2018
  40. Jeff KingAug 21, 2018
  41. 0/9 trailer-parsing false positivesJeff King, Aug 23, 2018
  42. 1/9 trailer: use size_t for string offsetsJeff King, Aug 23, 2018
  43. 2/9 trailer: use size_t for iterating trailer listJeff King, Aug 23, 2018
  44. 3/9 trailer: pass process_trailer_opts to trailer_info_get()Jeff King, Aug 23, 2018
  45. 4/9 interpret-trailers: tighten check for "---" patch boundaryJeff King, Aug 23, 2018
  46. 5/9 interpret-trailers: allow suppressing "---" dividerJeff King, Aug 23, 2018
  47. 6/9 pretty, ref-filter: format %(trailers) with no_divider optionJeff King, Aug 23, 2018
  48. 7/9 sequencer: ignore "---" divider when parsing trailersJeff King, Aug 23, 2018
  49. 8/9 append_signoff: use size_t for string offsetsJeff King, Aug 23, 2018
  50. 9/9 sequencer: handle ignore_footer when parsing trailersJeff King, Aug 23, 2018
  51. Junio C HamanoAug 23, 2018
  52. Jeff KingAug 24, 2018
  53. Jeff KingAug 21, 2018

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.