From: Christian Couder <christian.couder@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
Christian Couder <chriscool@tuxfamily.org>,
Ramsay Jones <ramsay@ramsayjones.plus.com>,
Jonathan Tan <jonathantanmy@google.com>
Subject: Re: [PATCH v3 4/9] pack-bitmap: don't rely on bitmap_git->reuse_objects
Date: Fri, 13 Dec 2019 14:26:39 +0100 [thread overview]
Message-ID: <CAP8UFD12rj9xhc64DVWTrXb+Vdh5FS_pNt1E2-_dmFDOqdzKiw@mail.gmail.com> (raw)
In-Reply-To: <20191209064740.GD40570@coredump.intra.peff.net>
On Mon, Dec 9, 2019 at 7:47 AM Jeff King <peff@peff.net> wrote:
> I think by dropping these hunks now, the state of the code at this point
> would mean that we might write the objects twice. We'd mark them as
> "reused" and send them as part of write_reused_pack(). But we'd also
> send them to pack-objects via the show_reachable_fn callback, and it
> would add them to the usual packing list.
>
> And indeed, t5310.10 fails at this point in the series with:
>
> Cloning into bare repository 'clone.git'...
> remote: Enumerating objects: 331, done.
> remote: Counting objects: 100% (331/331), done.
> remote: Compressing objects: 100% (111/111), done.
> remote: Total 662 (delta 108), reused 331 (delta 108), pack-reused 331
> Receiving objects: 100% (662/662), 53.14 KiB | 17.71 MiB/s, done.
> Resolving deltas: 100% (216/216), done.
> fatal: The same object 00c1d3730931e66eb08dabe3a3c9fa16621d728a appears twice in the pack
> fatal: index-pack failed
>
> and then starts working again after the final patch.
Yeah, I thought I had tested this, but anyway I squashed this patch
into the final patch to avoid failures.
next prev parent reply other threads:[~2019-12-13 13:26 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 14:15 [PATCH v3 0/9] Rewrite packfile reuse code Christian Couder
2019-11-15 14:15 ` [PATCH v3 1/9] builtin/pack-objects: report reused packfile objects Christian Couder
2019-12-09 6:24 ` Jeff King
2019-12-11 13:48 ` Christian Couder
2019-11-15 14:15 ` [PATCH v3 2/9] packfile: expose get_delta_base() Christian Couder
2019-12-09 6:26 ` Jeff King
2019-11-15 14:15 ` [PATCH v3 3/9] ewah/bitmap: introduce bitmap_word_alloc() Christian Couder
2019-12-09 6:28 ` Jeff King
2019-12-11 13:50 ` Christian Couder
2019-12-12 5:45 ` Jeff King
2019-11-15 14:15 ` [PATCH v3 4/9] pack-bitmap: don't rely on bitmap_git->reuse_objects Christian Couder
2019-12-09 6:47 ` Jeff King
2019-12-13 13:26 ` Christian Couder [this message]
2019-11-15 14:15 ` [PATCH v3 5/9] pack-bitmap: introduce bitmap_walk_contains() Christian Couder
2019-12-09 7:06 ` Jeff King
2019-12-13 13:27 ` Christian Couder
2019-11-15 14:15 ` [PATCH v3 6/9] csum-file: introduce hashfile_total() Christian Couder
2019-12-09 7:07 ` Jeff King
2019-11-15 14:15 ` [PATCH v3 7/9] pack-objects: introduce pack.allowPackReuse Christian Couder
2019-12-09 7:14 ` Jeff King
2019-12-13 13:27 ` Christian Couder
2019-11-15 14:15 ` [PATCH v3 8/9] builtin/pack-objects: introduce obj_is_packed() Christian Couder
2019-12-09 7:14 ` Jeff King
2019-11-15 14:15 ` [PATCH v3 9/9] pack-objects: improve partial packfile reuse Christian Couder
2019-12-09 8:11 ` Jeff King
2019-12-18 11:26 ` Christian Couder
2019-12-19 0:42 ` Jeff King
2020-01-23 22:29 ` Christian Couder
2019-11-15 18:03 ` [PATCH v3 0/9] Rewrite packfile reuse code Jonathan Tan
2019-11-25 6:30 ` Junio C Hamano
2019-11-25 6:36 ` Junio C Hamano
2019-12-06 21:42 ` Junio C Hamano
2019-12-07 10:12 ` Christian Couder
2019-12-07 20:47 ` Johannes Schindelin
2019-12-08 7:53 ` Christian Couder
2019-12-08 8:54 ` Johannes Schindelin
2019-12-08 10:26 ` Christian Couder
2019-12-08 10:45 ` Johannes Schindelin
2019-12-09 6:18 ` Jeff King
2019-12-09 9:28 ` Johannes Schindelin
2019-12-09 19:00 ` Junio C Hamano
2019-12-09 19:05 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAP8UFD12rj9xhc64DVWTrXb+Vdh5FS_pNt1E2-_dmFDOqdzKiw@mail.gmail.com \
--to=christian.couder@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).