diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-03 16:50:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-03 16:50:47 -0700 |
| commit | 69fd60a649dbe40390fa47e0ccc7478fcf64f451 (patch) | |
| tree | dc23db1153decce52dad424ca78b874f263610de | |
| parent | 00f97c72f22b82c6c77ae429986060832c6b6f55 (diff) | |
| parent | f04833ef9f330612a4116401258882b38e95744e (diff) | |
| download | git-69fd60a649dbe40390fa47e0ccc7478fcf64f451.tar.gz git-69fd60a649dbe40390fa47e0ccc7478fcf64f451.tar.xz | |
Merge branch 'np/maint-no-ofs-delta' into maint
* np/maint-no-ofs-delta:
honor repack.usedeltabaseoffset when fetching packs
| -rw-r--r-- | builtin-fetch-pack.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index 67fb80ec4..1effdc0d6 100644 --- a/builtin-fetch-pack.c +++ b/builtin-fetch-pack.c @@ -13,6 +13,7 @@ static int transfer_unpack_limit = -1; static int fetch_unpack_limit = -1; static int unpack_limit = 100; +static int prefer_ofs_delta = 1; static struct fetch_pack_args args = { /* .uploadpack = */ "git-upload-pack", }; @@ -200,7 +201,7 @@ static int find_common(int fd[2], unsigned char *result_sha1, (args.use_thin_pack ? " thin-pack" : ""), (args.no_progress ? " no-progress" : ""), (args.include_tag ? " include-tag" : ""), - " ofs-delta"); + (prefer_ofs_delta ? " ofs-delta" : "")); else packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); fetching++; @@ -597,6 +598,11 @@ static struct ref *do_fetch_pack(int fd[2], fprintf(stderr, "Server supports side-band\n"); use_sideband = 1; } + if (server_supports("ofs-delta")) { + if (args.verbose) + fprintf(stderr, "Server supports ofs-delta\n"); + } else + prefer_ofs_delta = 0; if (everything_local(&ref, nr_match, match)) { packet_flush(fd[1]); goto all_done; @@ -649,6 +655,11 @@ static int fetch_pack_config(const char *var, const char *value, void *cb) return 0; } + if (strcmp(var, "repack.usedeltabaseoffset") == 0) { + prefer_ofs_delta = git_config_bool(var, value); + return 0; + } + return git_default_config(var, value, cb); } |