Commit 348e390b authored by Shawn O. Pearce's avatar Shawn O. Pearce Committed by Junio C Hamano

Teach fetch-pack/upload-pack about --include-tag

The new protocol extension "include-tag" allows the client side
of the connection (fetch-pack) to request that the server side of the
native git protocol (upload-pack / pack-objects) use --include-tag
as it prepares the packfile, thus ensuring that an annotated tag object
will be included in the resulting packfile if the object it refers to
was also included into the packfile.
Signed-off-by: default avatarShawn O. Pearce <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent f0a24aa5
...@@ -8,7 +8,7 @@ git-fetch-pack - Receive missing objects from another repository ...@@ -8,7 +8,7 @@ git-fetch-pack - Receive missing objects from another repository
SYNOPSIS SYNOPSIS
-------- --------
'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>...]
DESCRIPTION DESCRIPTION
----------- -----------
...@@ -45,6 +45,12 @@ OPTIONS ...@@ -45,6 +45,12 @@ OPTIONS
Spend extra cycles to minimize the number of objects to be sent. Spend extra cycles to minimize the number of objects to be sent.
Use it on slower connection. Use it on slower connection.
\--include-tag::
If the remote side supports it, annotated tags objects will
be downloaded on the same connection as the other objects if
the object the tag references is downloaded. The caller must
otherwise determine the tags this option made available.
\--upload-pack=<git-upload-pack>:: \--upload-pack=<git-upload-pack>::
Use this to specify the path to 'git-upload-pack' on the Use this to specify the path to 'git-upload-pack' on the
remote side, if is not found on your $PATH. remote side, if is not found on your $PATH.
......
...@@ -18,7 +18,7 @@ static struct fetch_pack_args args = { ...@@ -18,7 +18,7 @@ static struct fetch_pack_args args = {
}; };
static const char fetch_pack_usage[] = 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 COMPLETE (1U << 0)
#define COMMON (1U << 1) #define COMMON (1U << 1)
...@@ -174,13 +174,14 @@ static int find_common(int fd[2], unsigned char *result_sha1, ...@@ -174,13 +174,14 @@ static int find_common(int fd[2], unsigned char *result_sha1,
} }
if (!fetching) 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), sha1_to_hex(remote),
(multi_ack ? " multi_ack" : ""), (multi_ack ? " multi_ack" : ""),
(use_sideband == 2 ? " side-band-64k" : ""), (use_sideband == 2 ? " side-band-64k" : ""),
(use_sideband == 1 ? " side-band" : ""), (use_sideband == 1 ? " side-band" : ""),
(args.use_thin_pack ? " thin-pack" : ""), (args.use_thin_pack ? " thin-pack" : ""),
(args.no_progress ? " no-progress" : ""), (args.no_progress ? " no-progress" : ""),
(args.include_tag ? " include-tag" : ""),
" ofs-delta"); " ofs-delta");
else else
packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); packet_write(fd[1], "want %s\n", sha1_to_hex(remote));
...@@ -680,6 +681,10 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) ...@@ -680,6 +681,10 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
args.use_thin_pack = 1; args.use_thin_pack = 1;
continue; continue;
} }
if (!strcmp("--include-tag", arg)) {
args.include_tag = 1;
continue;
}
if (!strcmp("--all", arg)) { if (!strcmp("--all", arg)) {
args.fetch_all = 1; args.fetch_all = 1;
continue; continue;
......
...@@ -12,7 +12,8 @@ struct fetch_pack_args ...@@ -12,7 +12,8 @@ struct fetch_pack_args
use_thin_pack:1, use_thin_pack:1,
fetch_all:1, fetch_all:1,
verbose:1, verbose:1,
no_progress:1; no_progress:1,
include_tag:1;
}; };
struct ref *fetch_pack(struct fetch_pack_args *args, struct ref *fetch_pack(struct fetch_pack_args *args,
......
...@@ -27,7 +27,8 @@ static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=n ...@@ -27,7 +27,8 @@ static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=n
static unsigned long oldest_have; static unsigned long oldest_have;
static int multi_ack, nr_our_refs; static int multi_ack, nr_our_refs;
static int use_thin_pack, use_ofs_delta, no_progress; static int use_thin_pack, use_ofs_delta, use_include_tag;
static int no_progress;
static struct object_array have_obj; static struct object_array have_obj;
static struct object_array want_obj; static struct object_array want_obj;
static unsigned int timeout; static unsigned int timeout;
...@@ -162,6 +163,8 @@ static void create_pack_file(void) ...@@ -162,6 +163,8 @@ static void create_pack_file(void)
argv[arg++] = "--progress"; argv[arg++] = "--progress";
if (use_ofs_delta) if (use_ofs_delta)
argv[arg++] = "--delta-base-offset"; argv[arg++] = "--delta-base-offset";
if (use_include_tag)
argv[arg++] = "--include-tag";
argv[arg++] = NULL; argv[arg++] = NULL;
memset(&pack_objects, 0, sizeof(pack_objects)); memset(&pack_objects, 0, sizeof(pack_objects));
...@@ -494,6 +497,8 @@ static void receive_needs(void) ...@@ -494,6 +497,8 @@ static void receive_needs(void)
use_sideband = DEFAULT_PACKET_MAX; use_sideband = DEFAULT_PACKET_MAX;
if (strstr(line+45, "no-progress")) if (strstr(line+45, "no-progress"))
no_progress = 1; no_progress = 1;
if (strstr(line+45, "include-tag"))
use_include_tag = 1;
/* We have sent all our refs already, and the other end /* We have sent all our refs already, and the other end
* should have chosen out of them; otherwise they are * should have chosen out of them; otherwise they are
...@@ -565,7 +570,8 @@ static void receive_needs(void) ...@@ -565,7 +570,8 @@ static void receive_needs(void)
static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
{ {
static const char *capabilities = "multi_ack thin-pack side-band" static const char *capabilities = "multi_ack thin-pack side-band"
" side-band-64k ofs-delta shallow no-progress"; " side-band-64k ofs-delta shallow no-progress"
" include-tag";
struct object *o = parse_object(sha1); struct object *o = parse_object(sha1);
if (!o) if (!o)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment