diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-10-13 18:57:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-15 11:23:40 -0700 |
| commit | 1a7141ff28e217312da4b289127875905c6ec479 (patch) | |
| tree | a8e87b3b44fb81f492d6e073008dbb4a85a3f2e6 | |
| parent | d8a1deecc6ef37728b951eaba051deb7e0a38af8 (diff) | |
| download | git-1a7141ff28e217312da4b289127875905c6ec479.tar.gz git-1a7141ff28e217312da4b289127875905c6ec479.tar.xz | |
Ignore funny refname sent from remote
This allows the remote side (most notably, upload-pack) to show
additional information without affecting the downloader. Peek-remote
does not ignore them -- this is to make it useful for Pasky's
automatic tag following.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | cache.h | 2 | ||||
| -rw-r--r-- | clone-pack.c | 2 | ||||
| -rw-r--r-- | connect.c | 8 | ||||
| -rw-r--r-- | fetch-pack.c | 2 | ||||
| -rw-r--r-- | peek-remote.c | 2 | ||||
| -rw-r--r-- | send-pack.c | 2 |
6 files changed, 12 insertions, 6 deletions
@@ -339,7 +339,7 @@ extern int path_match(const char *path, int nr, char **match); extern int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail, int nr_refspec, char **refspec, int all); extern int get_ack(int fd, unsigned char *result_sha1); -extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match); +extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, int ignore_funny); extern struct packed_git *parse_pack_index(unsigned char *sha1); extern struct packed_git *parse_pack_index_file(const unsigned char *sha1, diff --git a/clone-pack.c b/clone-pack.c index 0ea7e7f65..f9b263a44 100644 --- a/clone-pack.c +++ b/clone-pack.c @@ -287,7 +287,7 @@ static int clone_pack(int fd[2], int nr_match, char **match) struct ref *refs; int status; - get_remote_heads(fd[0], &refs, nr_match, match); + get_remote_heads(fd[0], &refs, nr_match, match, 1); if (!refs) { packet_flush(fd[1]); die("no matching remote head"); @@ -10,7 +10,8 @@ /* * Read all the refs from the other end */ -struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match) +struct ref **get_remote_heads(int in, struct ref **list, + int nr_match, char **match, int ignore_funny) { *list = NULL; for (;;) { @@ -29,6 +30,11 @@ struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **ma if (len < 42 || get_sha1_hex(buffer, old_sha1) || buffer[40] != ' ') die("protocol error: expected sha/ref, got '%s'", buffer); name = buffer + 41; + + if (ignore_funny && 45 < len && !memcmp(name, "refs/", 5) && + check_ref_format(name + 5)) + continue; + if (nr_match && !path_match(name, nr_match, match)) continue; ref = xcalloc(1, sizeof(*ref) + len - 40); diff --git a/fetch-pack.c b/fetch-pack.c index 582f967a7..953c0cf44 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -81,7 +81,7 @@ static int fetch_pack(int fd[2], int nr_match, char **match) int status; pid_t pid; - get_remote_heads(fd[0], &ref, nr_match, match); + get_remote_heads(fd[0], &ref, nr_match, match, 1); if (!ref) { packet_flush(fd[1]); die("no matching remote head"); diff --git a/peek-remote.c b/peek-remote.c index 4b1d0d5ba..ee49bf3b7 100644 --- a/peek-remote.c +++ b/peek-remote.c @@ -11,7 +11,7 @@ static int peek_remote(int fd[2]) { struct ref *ref; - get_remote_heads(fd[0], &ref, 0, NULL); + get_remote_heads(fd[0], &ref, 0, NULL, 0); packet_flush(fd[1]); while (ref) { diff --git a/send-pack.c b/send-pack.c index 55d8ff7e1..9f9a6e70b 100644 --- a/send-pack.c +++ b/send-pack.c @@ -181,7 +181,7 @@ static int send_pack(int in, int out, int nr_refspec, char **refspec) int new_refs; /* No funny business with the matcher */ - remote_tail = get_remote_heads(in, &remote_refs, 0, NULL); + remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, 1); get_local_heads(); /* match them up */ |