diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-22 22:51:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-22 22:51:42 -0700 |
| commit | 05eb811aa1546b696c6c4d55593cfd4fbef0dce5 (patch) | |
| tree | bad8266ba08310f00a1998063c545dd3707fdc3c /fetch-pack.c | |
| parent | 02a20456d2c5efccbdd0093ad2a16134f160c218 (diff) | |
| parent | 2d477051ef260aad352d63fc7d9c07e4ebb4359b (diff) | |
| download | git-05eb811aa1546b696c6c4d55593cfd4fbef0dce5.tar.gz | |
Merge branch 'np/pack'
* np/pack:
add the capability for index-pack to read from a stream
index-pack: compare only the first 20-bytes of the key.
git-repack: repo.usedeltabaseoffset
pack-objects: document --delta-base-offset option
allow delta data reuse even if base object is a preferred base
zap a debug remnant
let the GIT native protocol use offsets to delta base when possible
make pack data reuse compatible with both delta types
make git-pack-objects able to create deltas with offset to base
teach git-index-pack about deltas with offset to base
teach git-unpack-objects about deltas with offset to base
introduce delta objects with offset to base
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index e8708aa802..474d54520e 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -166,12 +166,13 @@ static int find_common(int fd[2], unsigned char *result_sha1, } if (!fetching) - packet_write(fd[1], "want %s%s%s%s%s\n", + packet_write(fd[1], "want %s%s%s%s%s%s\n", sha1_to_hex(remote), (multi_ack ? " multi_ack" : ""), (use_sideband == 2 ? " side-band-64k" : ""), (use_sideband == 1 ? " side-band" : ""), - (use_thin_pack ? " thin-pack" : "")); + (use_thin_pack ? " thin-pack" : ""), + " ofs-delta"); else packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); fetching++; |