git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Ben Maurer <bmaurer@fb.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] [RFC] Making use of bitmaps for thin objects
Date: Mon, 6 Jan 2014 15:38:47 -0500	[thread overview]
Message-ID: <20140106203847.GA643@sigill.intra.peff.net> (raw)
In-Reply-To: <20140106145723.GA15489@sigill.intra.peff.net>

On Mon, Jan 06, 2014 at 09:57:23AM -0500, Jeff King wrote:

> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index c733379..0cff874 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -1402,6 +1402,19 @@ static void check_object(struct object_entry *entry)
>  			base_entry->delta_child = entry;
>  			unuse_pack(&w_curs);
>  			return;
> +		} else if(base_ref && bitmap_have(base_ref)) {
> +			entry->type = entry->in_pack_type;
> +			entry->delta_size = entry->size;
> +			/*
> +			 * XXX we'll leak this, but it's probably OK
> +			 * since we'll exit immediately after the packing
> +			 * is done
> +			 */
> +			entry->delta = xcalloc(1, sizeof(*entry->delta));
> +			hashcpy(entry->delta->idx.sha1, base_ref);
> +			entry->delta->preferred_base = 1;
> +			unuse_pack(&w_curs);
> +			return;
>  		}

Just reading over this again, the conditional here should obviously be
checking "thin" (which needs to become a global, as in your patch).

-Peff

  reply	other threads:[~2014-01-06 20:38 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-22 19:47 [PATCH] [RFC] Making use of bitmaps for thin objects Ben Maurer
2013-12-22 21:55 ` Ben Maurer
2014-01-06 15:10   ` Jeff King
2014-01-06 16:37     ` Junio C Hamano
2014-01-06 19:41       ` Jeff King
2014-01-06 14:57 ` Jeff King
2014-01-06 20:38   ` Jeff King [this message]
2014-01-06 21:15   ` Ben Maurer
2014-01-06 21:57     ` Jeff King
2014-01-06 22:14       ` Ben Maurer
2014-01-07 17:26         ` Jeff King

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140106203847.GA643@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=bmaurer@fb.com \
    --cc=git@vger.kernel.org \
    /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.
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 NNTP newsgroup(s).