Merge branch 'sb/diff-delta-remove-needless-comparison'

gitster · gitster · commit 7216b1fb5c8c · 2013-09-04T12:36:44.000-07:00
* sb/diff-delta-remove-needless-comparison:
  create_delta_index: simplify condition always evaluating to true
diff --git a/diff-delta.c b/diff-delta.c
@@ -155,7 +155,7 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)
 		entries = 0xfffffffeU / RABIN_WINDOW;
 	}
 	hsize = entries / 4;
-	for (i = 4; (1u << i) < hsize && i < 31; i++);
+	for (i = 4; (1u << i) < hsize; i++);
 	hsize = 1 << i;
 	hmask = hsize - 1;
 

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ struct delta_index * create_delta_index(const void *buf, unsigned long bufsize)`
`155`	`155`	`entries = 0xfffffffeU / RABIN_WINDOW;`
`156`	`156`	`}`
`157`	`157`	`hsize = entries / 4;`
`158`		`- for (i = 4; (1u << i) < hsize && i < 31; i++);`
	`158`	`+ for (i = 4; (1u << i) < hsize; i++);`
`159`	`159`	`hsize = 1 << i;`
`160`	`160`	`hmask = hsize - 1;`
`161`	`161`