summaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-10-08 18:09:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-09 05:30:02 (GMT)
commitbdf4276c91623cf57efefd2ada7fb3e0709e2230 (patch)
tree4fb58324836e7517b40e3d9612d6c1ceb72ef208 /transport.c
parentcae598d9980661a978e2df4fb338518f7bf09572 (diff)
downloadgit-bdf4276c91623cf57efefd2ada7fb3e0709e2230.zip
git-bdf4276c91623cf57efefd2ada7fb3e0709e2230.tar.gz
git-bdf4276c91623cf57efefd2ada7fb3e0709e2230.tar.bz2
transport: drop refnames from for_each_alternate_ref
None of the current callers use the refname parameter we pass to their callbacks. In theory somebody _could_ do so, but it's actually quite weird if you think about it: it's a ref in somebody else's repository. So the name has no meaning locally, and in fact there may be duplicates if there are multiple alternates. The users of this interface really only care about seeing some ref tips, since that promises that the alternate has the full commit graph reachable from there. So let's keep the information we pass back to the bare minimum. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Taylor Blau <me@ttaylorr.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/transport.c b/transport.c
index 06ffea2..1ae2973 100644
--- a/transport.c
+++ b/transport.c
@@ -1336,7 +1336,7 @@ static void read_alternate_refs(const char *path,
cmd.git_cmd = 1;
argv_array_pushf(&cmd.args, "--git-dir=%s", path);
argv_array_push(&cmd.args, "for-each-ref");
- argv_array_push(&cmd.args, "--format=%(objectname) %(refname)");
+ argv_array_push(&cmd.args, "--format=%(objectname)");
cmd.env = local_repo_env;
cmd.out = -1;
@@ -1348,13 +1348,13 @@ static void read_alternate_refs(const char *path,
struct object_id oid;
if (get_oid_hex(line.buf, &oid) ||
- line.buf[GIT_SHA1_HEXSZ] != ' ') {
+ line.buf[GIT_SHA1_HEXSZ]) {
warning(_("invalid line while parsing alternate refs: %s"),
line.buf);
break;
}
- cb(line.buf + GIT_SHA1_HEXSZ + 1, &oid, data);
+ cb(&oid, data);
}
fclose(fh);