summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2017-10-12 12:02:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-10-13 00:26:08 (GMT)
commita42d6fd274940be9c0fa6ada738e7611d011a1fc (patch)
tree58eacc49d0b395815d53c16a81ce3f6443c9de4c /sha1_name.c
parent5b20ace6a81e5fe1366b07c51b1f577f356a20ff (diff)
downloadgit-a42d6fd274940be9c0fa6ada738e7611d011a1fc.zip
git-a42d6fd274940be9c0fa6ada738e7611d011a1fc.tar.gz
git-a42d6fd274940be9c0fa6ada738e7611d011a1fc.tar.bz2
sha1_name: parse less while finding common prefix
Create get_hex_char_from_oid() to parse oids one hex character at a time. This prevents unnecessary copying of hex characters in extend_abbrev_len() when finding the length of a common prefix. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 4b6c089..733815f 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -480,13 +480,23 @@ struct min_abbrev_data {
char *hex;
};
+static inline char get_hex_char_from_oid(const struct object_id *oid,
+ unsigned int pos)
+{
+ static const char hex[] = "0123456789abcdef";
+
+ if ((pos & 1) == 0)
+ return hex[oid->hash[pos >> 1] >> 4];
+ else
+ return hex[oid->hash[pos >> 1] & 0xf];
+}
+
static int extend_abbrev_len(const struct object_id *oid, void *cb_data)
{
struct min_abbrev_data *mad = cb_data;
- char *hex = oid_to_hex(oid);
unsigned int i = mad->init_len;
- while (mad->hex[i] && mad->hex[i] == hex[i])
+ while (mad->hex[i] && mad->hex[i] == get_hex_char_from_oid(oid, i))
i++;
if (i < GIT_MAX_RAWSZ && i >= mad->cur_len)