From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>
Subject: [PATCH 1/6] Introduce a get_oid function.
Date: Sun, 17 Apr 2016 23:10:36 +0000 [thread overview]
Message-ID: <1460934641-435791-2-git-send-email-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <1460934641-435791-1-git-send-email-sandals@crustytoothpaste.net>
The get_oid function is equivalent to the get_sha1 function, but uses a
struct object_id instead.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
cache.h | 2 ++
sha1_name.c | 9 +++++++++
2 files changed, 11 insertions(+)
diff --git a/cache.h b/cache.h
index 2711048c..22b73646 100644
--- a/cache.h
+++ b/cache.h
@@ -1156,6 +1156,8 @@ extern int get_sha1_blob(const char *str, unsigned char *sha1);
extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
extern int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc);
+extern int get_oid(const char *str, struct object_id *oid);
+
typedef int each_abbrev_fn(const unsigned char *sha1, void *);
extern int for_each_abbrev(const char *prefix, each_abbrev_fn, void *);
diff --git a/sha1_name.c b/sha1_name.c
index 776101e8..ca7ddd6f 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -1215,6 +1215,15 @@ int get_sha1(const char *name, unsigned char *sha1)
}
/*
+ * This is like "get_sha1()", but for struct object_id.
+ */
+int get_oid(const char *name, struct object_id *oid)
+{
+ return get_sha1(name, oid->hash);
+}
+
+
+/*
* Many callers know that the user meant to name a commit-ish by
* syntactical positions where the object name appears. Calling this
* function allows the machinery to disambiguate shorter-than-unique
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-04-18 2:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-17 23:10 [PATCH 0/6] object_id Part 3 brian m. carlson
2016-04-17 23:10 ` brian m. carlson [this message]
2016-04-17 23:10 ` [PATCH 2/6] test-match-trees: convert to use struct object_id brian m. carlson
2016-04-17 23:10 ` [PATCH 3/6] match-trees: convert shift_tree and shift_tree_by to object_id brian m. carlson
2016-04-17 23:10 ` [PATCH 4/6] Convert struct name_entry to use struct object_id brian m. carlson
2016-04-19 23:02 ` Junio C Hamano
2016-04-19 23:16 ` brian m. carlson
2016-04-20 0:17 ` Junio C Hamano
2016-04-17 23:10 ` [PATCH 5/6] tree-walk: convert tree_entry_extract to " brian m. carlson
2016-04-17 23:10 ` [PATCH 6/6] match-trees: convert several leaf functions " 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=1460934641-435791-2-git-send-email-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).