summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-18 20:50:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-18 20:50:11 (GMT)
commita8e1d711cc9531463fe312875553d56624eb9c37 (patch)
treeb30545b0b56d3b86e4578b545bdd84e4e886ab7c /commit.c
parent90e6255a6d01760d13d8ac635cca5819b0b4dbc5 (diff)
parent0a9136f32758a785fe552adc58bba5824f85e5b7 (diff)
downloadgit-a8e1d711cc9531463fe312875553d56624eb9c37.zip
git-a8e1d711cc9531463fe312875553d56624eb9c37.tar.gz
git-a8e1d711cc9531463fe312875553d56624eb9c37.tar.bz2
Merge branch 'dd/find-graft-with-sha1-pos'
Replace a hand-rolled binary search with a call to our generic binary search helper function. * dd/find-graft-with-sha1-pos: commit.c: use the generic "sha1_pos" function for lookup
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/commit.c b/commit.c
index fa401ae..a263947 100644
--- a/commit.c
+++ b/commit.c
@@ -10,6 +10,7 @@
#include "mergesort.h"
#include "commit-slab.h"
#include "prio-queue.h"
+#include "sha1-lookup.h"
static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
@@ -114,23 +115,16 @@ static unsigned long parse_commit_date(const char *buf, const char *tail)
static struct commit_graft **commit_graft;
static int commit_graft_alloc, commit_graft_nr;
+static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
+{
+ struct commit_graft **commit_graft_table = table;
+ return commit_graft_table[index]->sha1;
+}
+
static int commit_graft_pos(const unsigned char *sha1)
{
- int lo, hi;
- lo = 0;
- hi = commit_graft_nr;
- while (lo < hi) {
- int mi = (lo + hi) / 2;
- struct commit_graft *graft = commit_graft[mi];
- int cmp = hashcmp(sha1, graft->sha1);
- if (!cmp)
- return mi;
- if (cmp < 0)
- hi = mi;
- else
- lo = mi + 1;
- }
- return -lo - 1;
+ return sha1_pos(sha1, commit_graft, commit_graft_nr,
+ commit_graft_sha1_access);
}
int register_commit_graft(struct commit_graft *graft, int ignore_dups)