On Sun, 15 Oct 2006, Junio C Hamano wrote:
> This introduces a new configuration item, pack.deltaversion, to
> control whether pack-objects is allowed to use version 3 delta.
> By default, we keep generating version 2 delta (and version 2
> packfile format) to be compatible with git earlier than v1.2.0.
>
> This configuration affects the command in the following ways:
>
> - the resulting packfile will have the specified version;
>
> - when generating delta, larger copies are allowed only when
> deltaversion is 3;
>
> - the logic to reuse delta from existing packs refuses to reuse
> delta from packs that uses delta version 3 when the
> configuration is set to 2.
>
> Signed-off-by: Junio C Hamano <junkio@xxxxxxx>
I'd suggest to drop this altogether. See my previous email for my
reasoning on this issue. I think this should be done another way.
If anything, maybe this patch can be added before v1.4.3 is released:
diff --git a/fetch-pack.c b/fetch-pack.c
index 7d23a80..1688417 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -165,9 +165,10 @@ static int find_common(int fd[2], unsign
continue;
}
- packet_write(fd[1], "want %s%s%s\n", sha1_to_hex(remote),
+ packet_write(fd[1], "want %s%s%s%s\n", sha1_to_hex(remote),
(multi_ack ? " multi_ack" : ""),
- (use_thin_pack ? " thin-pack" : ""));
+ (use_thin_pack ? " thin-pack" : ""),
+ " packv3");
fetching++;
}
packet_flush(fd[1]);
diff --git a/upload-pack.c b/upload-pack.c
index 979e583..8e57316 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -218,7 +218,7 @@ static int receive_needs(void)
static int send_ref(const char *refname, const unsigned char *sha1)
{
- static char *capabilities = "multi_ack thin-pack";
+ static char *capabilities = "multi_ack thin-pack packv3";
struct object *o = parse_object(sha1);
if (!o)
This way pack v3 could be fed to GIT v1.4.3 and above whenever we add
back pack v3 generation, and a pack converted to v2 from any v3 on the
fly when that capability is not present.
Nicolas
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html