From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: Brandon Williams <bmwill@google.com>,
Stefan Beller <stefanbeller@gmail.com>, Jeff King <peff@peff.net>
Subject: [PATCH v2 10/13] Convert remaining callers of get_sha1 to get_oid.
Date: Thu, 13 Jul 2017 23:49:27 +0000 [thread overview]
Message-ID: <20170713234930.949612-11-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20170713234930.949612-1-sandals@crustytoothpaste.net>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
builtin/receive-pack.c | 4 ++--
mailmap.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 71c0c768db..1efa48fec4 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -919,9 +919,9 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
*/
static int head_has_history(void)
{
- unsigned char sha1[20];
+ struct object_id oid;
- return !get_sha1("HEAD", sha1);
+ return !get_oid("HEAD", &oid);
}
static const char *push_to_deploy(unsigned char *sha1,
diff --git a/mailmap.c b/mailmap.c
index c1a79c100c..cb921b4db6 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -214,17 +214,17 @@ static int read_mailmap_blob(struct string_list *map,
const char *name,
char **repo_abbrev)
{
- unsigned char sha1[20];
+ struct object_id oid;
char *buf;
unsigned long size;
enum object_type type;
if (!name)
return 0;
- if (get_sha1(name, sha1) < 0)
+ if (get_oid(name, &oid) < 0)
return 0;
- buf = read_sha1_file(sha1, &type, &size);
+ buf = read_sha1_file(oid.hash, &type, &size);
if (!buf)
return error("unable to read mailmap object at %s", name);
if (type != OBJ_BLOB)
next prev parent reply other threads:[~2017-07-13 23:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-13 23:49 [PATCH v2 00/13] object_id part 9 brian m. carlson
2017-07-13 23:49 ` [PATCH v2 01/13] builtin/fsck: convert remaining caller of get_sha1 to object_id brian m. carlson
2017-07-13 23:49 ` [PATCH v2 02/13] builtin/merge-tree: " brian m. carlson
2017-07-13 23:49 ` [PATCH v2 03/13] submodule: convert submodule config lookup to use object_id brian m. carlson
2017-07-13 23:49 ` [PATCH v2 04/13] remote: convert struct push_cas to struct object_id brian m. carlson
2017-07-13 23:49 ` [PATCH v2 05/13] sequencer: convert " brian m. carlson
2017-07-13 23:49 ` [PATCH v2 06/13] builtin/update_ref: " brian m. carlson
2017-07-13 23:49 ` [PATCH v2 07/13] bisect: convert bisect_checkout " brian m. carlson
2017-07-13 23:49 ` [PATCH v2 08/13] builtin/unpack-file: convert " brian m. carlson
2017-07-13 23:49 ` [PATCH v2 09/13] builtin/verify-tag: " brian m. carlson
2017-07-13 23:49 ` brian m. carlson [this message]
2017-07-13 23:49 ` [PATCH v2 11/13] sha1_name: convert get_sha1* to get_oid* brian m. carlson
2017-07-13 23:49 ` [PATCH v2 12/13] sha1_name: convert GET_SHA1* flags to GET_OID* brian m. carlson
2017-07-13 23:49 ` [PATCH v2 13/13] sha1_name: convert uses of 40 to GIT_SHA1_HEXSZ brian m. carlson
2017-07-14 19:35 ` [PATCH v2 00/13] object_id part 9 Brandon Williams
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170713234930.949612-11-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=stefanbeller@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).