Merge branch 'ew/gc-auto-pack-limit-fix' into maint

gitster · gitster · commit 87be95b6f9c5 · 2016-07-28T11:25:56.000-07:00
"gc.autoPackLimit" when set to 1 should not trigger a repacking
when there is only one pack, but the code counted poorly and did
so.

* ew/gc-auto-pack-limit-fix:
  gc: fix off-by-one error with gc.autoPackLimit
diff --git a/builtin/gc.c b/builtin/gc.c
@@ -177,7 +177,7 @@ static int too_many_packs(void)
 		 */
 		cnt++;
 	}
-	return gc_auto_pack_limit <= cnt;
+	return gc_auto_pack_limit < cnt;
 }
 
 static void add_repack_all_option(void)

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ static int too_many_packs(void)`
`177`	`177`	`*/`
`178`	`178`	`cnt++;`
`179`	`179`	`}`
`180`		`- return gc_auto_pack_limit <= cnt;`
	`180`	`+ return gc_auto_pack_limit < cnt;`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`static void add_repack_all_option(void)`