Re: [PATCH] commit.c: use the generic "sha1_pos" function for lookup sha1
flat view
From: Jeff King <hidden>
Date: 2016-06-15 23:00:00
On Wed, Feb 26, 2014 at 02:07:47PM +0400, Dmitry S. Dolzhenko wrote:
Refactor binary search in "commit_graft_pos" function: use generic "sha1_pos" function.
Sounds sensible.
A few administrative points for your patch:
- we usually try to send patches inline, rather than as attachments.
It almost looks like your mailer or a server on the path converted
your mail to a multipart/mixed and stuck a useless empty attachment
on the end.
- Your patch did not apply for me, nor to the blobs mentioned in its
header. Did you modify it after it was generated? I think this part
in particular looks suspicious:
quoted hunk ↗ jump to hunk
diff --git a/commit.c b/commit.c index 6bf4fe0..8edaeb7 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 **);
There are 3 context lines above, but only one below?
quoted hunk ↗ jump to hunk
@@ -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; +} +
And here we have only two context lines, and the first addition line is indented (making it look like a context line).
quoted hunk ↗ jump to hunk
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);
The patch itself looks correct. -Peff