diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:11:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-08 20:11:35 -0800 |
| commit | 5b278ebe87b24353fbac8231eeffd4c531fed8f4 (patch) | |
| tree | e08ee5fe88d931c0761a4fede274f62c9069d2f9 /builtin-fetch-pack.c | |
| parent | 686bc52a897abfa2497c8f137f06e44c8e559659 (diff) | |
| parent | 41fa7d2eaeace0c5c23fc75a3d5cc9efbad467a5 (diff) | |
| download | git-5b278ebe87b24353fbac8231eeffd4c531fed8f4.tar.gz git-5b278ebe87b24353fbac8231eeffd4c531fed8f4.tar.xz | |
Merge branch 'sp/fetch-optim'
* sp/fetch-optim:
Teach git-fetch to exploit server side automatic tag following
Teach fetch-pack/upload-pack about --include-tag
git-pack-objects: Automatically pack annotated tags if object was packed
Teach git-fetch to grab a tag at the same time as a commit
Make git-fetch follow tags we already have objects for sooner
Teach upload-pack to log the received need lines to an fd
Free the path_lists used to find non-local tags in git-fetch
Allow builtin-fetch's find_non_local_tags to append onto a list
Ensure tail pointer gets setup correctly when we fetch HEAD only
Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch
Remove unused variable in builtin-fetch find_non_local_tags
Diffstat (limited to 'builtin-fetch-pack.c')
| -rw-r--r-- | builtin-fetch-pack.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index 29b38e465..7b2802422 100644 --- a/builtin-fetch-pack.c +++ b/builtin-fetch-pack.c @@ -18,7 +18,7 @@ static struct fetch_pack_args args = { }; static const char fetch_pack_usage[] = -"git-fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>...]"; +"git-fetch-pack [--all] [--quiet|-q] [--keep|-k] [--thin] [--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] [--no-progress] [-v] [<host>:]<directory> [<refs>...]"; #define COMPLETE (1U << 0) #define COMMON (1U << 1) @@ -176,13 +176,14 @@ static int find_common(int fd[2], unsigned char *result_sha1, } if (!fetching) - packet_write(fd[1], "want %s%s%s%s%s%s%s\n", + packet_write(fd[1], "want %s%s%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" : ""), (args.use_thin_pack ? " thin-pack" : ""), (args.no_progress ? " no-progress" : ""), + (args.include_tag ? " include-tag" : ""), " ofs-delta"); else packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); @@ -683,6 +684,10 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) args.use_thin_pack = 1; continue; } + if (!strcmp("--include-tag", arg)) { + args.include_tag = 1; + continue; + } if (!strcmp("--all", arg)) { args.fetch_all = 1; continue; |