summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-03-26 16:01:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-28 16:59:33 (GMT)
commit9e1d7087dcf0f6e7056f4536c3c750cf6cfe37a4 (patch)
tree64b21f61a93e3921c4229473cf6ed3463d59e7a2
parent365c27fbffd9a1e08ac5f1e423c99ece6c27d22e (diff)
downloadgit-9e1d7087dcf0f6e7056f4536c3c750cf6cfe37a4.zip
git-9e1d7087dcf0f6e7056f4536c3c750cf6cfe37a4.tar.gz
git-9e1d7087dcf0f6e7056f4536c3c750cf6cfe37a4.tar.bz2
parse-options-cb: convert sha1_array_append caller to struct object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--parse-options-cb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/parse-options-cb.c b/parse-options-cb.c
index b7d8f7d..40ece4d 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -96,7 +96,7 @@ int parse_opt_commits(const struct option *opt, const char *arg, int unset)
int parse_opt_object_name(const struct option *opt, const char *arg, int unset)
{
- unsigned char sha1[20];
+ struct object_id oid;
if (unset) {
sha1_array_clear(opt->value);
@@ -104,9 +104,9 @@ int parse_opt_object_name(const struct option *opt, const char *arg, int unset)
}
if (!arg)
return -1;
- if (get_sha1(arg, sha1))
+ if (get_oid(arg, &oid))
return error(_("malformed object name '%s'"), arg);
- sha1_array_append(opt->value, sha1);
+ sha1_array_append(opt->value, oid.hash);
return 0;
}