Skip to content

Commit

Permalink
Merge pull request #996 from jeffhostetler/jeffhostetler/register_ren…
Browse files Browse the repository at this point in the history
…ame_src

diffcore-rename: speed up register_rename_src
  • Loading branch information
Git for Windows Build Agent committed Jan 18, 2017
2 parents 6796c1e + cdd6426 commit 3c2c99c
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions diffcore-rename.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,18 @@ static struct diff_rename_src *register_rename_src(struct diff_filepair *p)

first = 0;
last = rename_src_nr;

if (last > 0) {
struct diff_rename_src *src = &(rename_src[last-1]);
int cmp = strcmp(one->path, src->p->one->path);
if (!cmp)
return src;
if (cmp > 0) {
first = last;
goto append_it;
}
}

while (last > first) {
int next = (last + first) >> 1;
struct diff_rename_src *src = &(rename_src[next]);
Expand All @@ -94,6 +106,7 @@ static struct diff_rename_src *register_rename_src(struct diff_filepair *p)
first = next+1;
}

append_it:
/* insert to make it at "first" */
ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
rename_src_nr++;
Expand Down

0 comments on commit 3c2c99c

Please sign in to comment.