Re: [ANNOUNCE] Example Cogito Addon - cogito-bundle
From: Nicolas Pitre <hidden>
Date: 2016-06-15 22:42:44
Subsystem:
the rest · Maintainer:
Linus Torvalds
On Wed, 18 Oct 2006, Petr Baudis wrote:
By the way, originally I just wanted to index and save the pack, but when trying to feed it to git-index-pack, I kept getting fatal: packfile '.git/objects/pack/pack-b2ab684daebea5b9c5a6492fa732e0d2e1799c8e.pack' has unresolved deltas while feeding it to git-unpack-objects works fine. Any idea what's wrong?
Did you really manage to miss the "heads-up: git-index-pack in "next" is broken" thread? The fix:
diff --git a/index-pack.c b/index-pack.c
index fffddd2..56c590e 100644
--- a/index-pack.c
+++ b/index-pack.c@@ -23,6 +23,12 @@ union delta_base { unsigned long offset; }; +/* + * Even if sizeof(union delta_base) == 24 on 64-bit archs, we really want + * to memcmp() only the first 20 bytes. + */ +#define UNION_BASE_SZ 20 + struct delta_entry { struct object_entry *obj;
@@ -211,7 +217,7 @@ static int find_delta(const union delta_ struct delta_entry *delta = &deltas[next]; int cmp; - cmp = memcmp(base, &delta->base, sizeof(*base)); + cmp = memcmp(base, &delta->base, UNION_BASE_SZ); if (!cmp) return next; if (cmp < 0) {
@@ -232,9 +238,9 @@ static int find_delta_childs(const union if (first < 0) return -1; - while (first > 0 && !memcmp(&deltas[first - 1].base, base, sizeof(*base))) + while (first > 0 && !memcmp(&deltas[first - 1].base, base, UNION_BASE_SZ)) --first; - while (last < end && !memcmp(&deltas[last + 1].base, base, sizeof(*base))) + while (last < end && !memcmp(&deltas[last + 1].base, base, UNION_BASE_SZ)) ++last; *first_index = first; *last_index = last;
@@ -312,7 +318,7 @@ static int compare_delta_entry(const voi { const struct delta_entry *delta_a = a; const struct delta_entry *delta_b = b; - return memcmp(&delta_a->base, &delta_b->base, sizeof(union delta_base)); + return memcmp(&delta_a->base, &delta_b->base, UNION_BASE_SZ); } static void parse_pack_objects(void)
Nicolas