From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: "Jeff King" <peff@peff.net>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Michael Haggerty" <mhagger@alum.mit.edu>
Subject: [PATCH v3 05/13] parse_fetch: convert to use struct object_id
Date: Fri, 9 Oct 2015 01:43:51 +0000 [thread overview]
Message-ID: <1444355039-186351-6-git-send-email-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <1444355039-186351-1-git-send-email-sandals@crustytoothpaste.net>
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>
---
remote-curl.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/remote-curl.c b/remote-curl.c
index c4b645e5..10160e63 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -806,19 +806,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;
--
2.6.1
next prev parent reply other threads:[~2015-10-09 1:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-09 1:43 [PATCH v3 00/13] object_id part 2 brian m. carlson
2015-10-09 1:43 ` [PATCH v3 01/13] refs: convert some internal functions to use object_id brian m. carlson
2015-10-13 11:43 ` Michael Haggerty
2015-10-14 2:50 ` brian m. carlson
2015-10-09 1:43 ` [PATCH v3 02/13] sha1_file: introduce has_object_file helper brian m. carlson
2015-10-09 1:43 ` [PATCH v3 03/13] Convert struct ref to use object_id brian m. carlson
2015-10-09 1:43 ` [PATCH v3 04/13] add_sought_entry_mem: convert to struct object_id brian m. carlson
2015-10-09 1:43 ` brian m. carlson [this message]
2015-10-09 1:43 ` [PATCH v3 06/13] get_remote_heads: " brian m. carlson
2015-10-09 1:43 ` [PATCH v3 07/13] push_refs_with_export: " brian m. carlson
2015-10-09 1:43 ` [PATCH v3 08/13] ref_newer: convert to use " brian m. carlson
2015-10-09 1:43 ` [PATCH v3 09/13] object: introduce get_object_hash macro brian m. carlson
2015-10-09 1:43 ` [PATCH v3 10/13] Add several uses of get_object_hash brian m. carlson
2015-10-09 1:43 ` [PATCH v3 11/13] Convert struct object to object_id brian m. carlson
2015-10-09 1:43 ` [PATCH v3 12/13] Remove get_object_hash brian m. carlson
2015-10-09 1:43 ` [PATCH v3 13/13] remote: convert functions to struct object_id brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444355039-186351-6-git-send-email-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).