Merge branch 'rs/find-pack-entry-bisection' into maint

gitster · gitster · commit c580ce194fc1 · 2017-09-10T17:03:02.000+09:00
Code clean-up.

* rs/find-pack-entry-bisection:
  sha1_file: avoid comparison if no packed hash matches the first byte
diff --git a/sha1_file.c b/sha1_file.c
@@ -2800,7 +2800,7 @@ off_t find_pack_entry_one(const unsigned char *sha1,
 		return nth_packed_object_offset(p, pos);
 	}
 
-	do {
+	while (lo < hi) {
 		unsigned mi = (lo + hi) / 2;
 		int cmp = hashcmp(index + mi * stride, sha1);
 
@@ -2813,7 +2813,7 @@ off_t find_pack_entry_one(const unsigned char *sha1,
 			hi = mi;
 		else
 			lo = mi+1;
-	} while (lo < hi);
+	}
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2800,7 +2800,7 @@ off_t find_pack_entry_one(const unsigned char *sha1,`
`2800`	`2800`	`return nth_packed_object_offset(p, pos);`
`2801`	`2801`	`}`
`2802`	`2802`
`2803`		`- do {`
	`2803`	`+ while (lo < hi) {`
`2804`	`2804`	`unsigned mi = (lo + hi) / 2;`
`2805`	`2805`	`int cmp = hashcmp(index + mi * stride, sha1);`
`2806`	`2806`
`@@ -2813,7 +2813,7 @@ off_t find_pack_entry_one(const unsigned char *sha1,`
`2813`	`2813`	`hi = mi;`
`2814`	`2814`	`else`
`2815`	`2815`	`lo = mi+1;`
`2816`		`- } while (lo < hi);`
	`2816`	`+ }`
`2817`	`2817`	`return 0;`
`2818`	`2818`	`}`
`2819`	`2819`