diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2015-11-10 02:22:22 +0000 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2015-11-20 08:02:05 -0500 |
| commit | 8338c911d1c22a6d86d694003a1fa213cbe11bcf (patch) | |
| tree | 0fa7fbce2ff88198803a839a0460a33e055e87b8 | |
| parent | add_sought_entry_mem: convert to struct object_id (diff) | |
| download | tgif-8338c911d1c22a6d86d694003a1fa213cbe11bcf.tar.xz | |
parse_fetch: convert to use struct object_id
Convert the parse_fetch function to use struct object_id. Remove the
strlen check as get_oid_hex will fail safely on receiving a too-short
NUL-terminated string.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Jeff King <peff@peff.net>
| -rw-r--r-- | remote-curl.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/remote-curl.c b/remote-curl.c index bc3af79e4a..f404faf0f4 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -803,19 +803,19 @@ static void parse_fetch(struct strbuf *buf) if (skip_prefix(buf->buf, "fetch ", &p)) { const char *name; struct ref *ref; - unsigned char old_sha1[20]; + struct object_id old_oid; - if (strlen(p) < 40 || get_sha1_hex(p, old_sha1)) + if (get_oid_hex(p, &old_oid)) die("protocol error: expected sha/ref, got %s'", p); - if (p[40] == ' ') - name = p + 41; - else if (!p[40]) + if (p[GIT_SHA1_HEXSZ] == ' ') + name = p + GIT_SHA1_HEXSZ + 1; + else if (!p[GIT_SHA1_HEXSZ]) name = ""; else die("protocol error: expected sha/ref, got %s'", p); ref = alloc_ref(name); - hashcpy(ref->old_oid.hash, old_sha1); + oidcpy(&ref->old_oid, &old_oid); *list = ref; list = &ref->next; |