diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-09 21:13:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-09 21:13:46 -0800 |
| commit | 0d9d89f61c58f72d96585a61defb0634873c38ac (patch) | |
| tree | fcb314481bb669dcf1f33ba3934786c1dcc51b12 /builtin-fetch-pack.c | |
| parent | Merge branch 'jk/terse-push' into aw/mirror-push (diff) | |
| parent | Update draft release notes for 1.5.4 (diff) | |
| download | tgif-0d9d89f61c58f72d96585a61defb0634873c38ac.tar.xz | |
Merge master into aw/mirror-push
Diffstat (limited to 'builtin-fetch-pack.c')
| -rw-r--r-- | builtin-fetch-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index 862652be92..bb1742f1a2 100644 --- a/builtin-fetch-pack.c +++ b/builtin-fetch-pack.c @@ -32,7 +32,7 @@ static const char fetch_pack_usage[] = #define MAX_IN_VAIN 256 static struct commit_list *rev_list; -static int non_common_revs, multi_ack, use_thin_pack, use_sideband; +static int non_common_revs, multi_ack, use_sideband; static void rev_list_push(struct commit *commit, int mark) { @@ -178,7 +178,7 @@ static int find_common(int fd[2], unsigned char *result_sha1, (multi_ack ? " multi_ack" : ""), (use_sideband == 2 ? " side-band-64k" : ""), (use_sideband == 1 ? " side-band" : ""), - (use_thin_pack ? " thin-pack" : ""), + (args.use_thin_pack ? " thin-pack" : ""), (args.no_progress ? " no-progress" : ""), " ofs-delta"); else |