undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/slim-index-pack-memory-usage'

Browse Source 
An earlier optimization broke index-pack for a large object
transfer; this fixes it before the breakage hits any released
version.

* nd/slim-index-pack-memory-usage:
  index-pack: fix truncation of off_t in comparison
This commit is contained in:
Junio C Hamano 2015-06-16 14:27:08 -07:00
commit c3b1c1e9b2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/index-pack.c
View File

@ -616,7 +616,9 @@ static int compare_ofs_delta_bases(off_t offset1, off_t offset2,
int cmp = type1 - type2; int cmp = type1 - type2;
if (cmp) if (cmp)
return cmp; return cmp;
return offset1 - offset2; return offset1 < offset2 ? -1 :
offset1 > offset2 ? 1 :
0;
} }
static int find_ofs_delta(const off_t offset, enum object_type type) static int find_ofs_delta(const off_t offset, enum object_type type)
@ -1051,7 +1053,9 @@ static int compare_ofs_delta_entry(const void *a, const void *b)
const struct ofs_delta_entry *delta_a = a; const struct ofs_delta_entry *delta_a = a;
const struct ofs_delta_entry *delta_b = b; const struct ofs_delta_entry *delta_b = b;
return delta_a->offset - delta_b->offset; return delta_a->offset < delta_b->offset ? -1 :
delta_a->offset > delta_b->offset ? 1 :
0;
} }
static int compare_ref_delta_entry(const void *a, const void *b) static int compare_ref_delta_entry(const void *a, const void *b)