Commit Diff


commit - 2fd60f4be89645d0aceadfad156b4ea7575fe53169a6c5b967e74264d7b656e6
commit + 0c56991c4dc86cc1e17785ae68843010cab7f15da10b3a38e50c5d8ebf80863f
blob - 00fe12c5545df628c9c0552431915235dcbd301ff60e08270762648864bb6eff
blob + 0f31c12a840d21287e496ade896ad2d198af0ac6cdac67596ec8e0ab84fd98b3
--- lib/pack_create.c	
+++ lib/pack_create.c	
@@ -1259,7 +1259,7 @@ findtwixt(struct got_object_id ***res, int *nres, int 
 	const struct got_error *err = NULL;
 	struct got_object_id_queue ids;
 	struct got_object_idset *keep, *drop, *skip = NULL;
-	int i, nkeep;
+	int i, nkeep, nqueued = 0;
 
 	STAILQ_INIT(&ids);
 	*res = NULL;
@@ -1289,6 +1289,7 @@ findtwixt(struct got_object_id ***res, int *nres, int 
 		err = queue_commit_or_tag_id(id, COLOR_KEEP, &ids, repo);
 		if (err)
 			goto done;
+		nqueued++;
 	}
 
 	for (i = 0; i < ntail; i++) {
@@ -1298,9 +1299,10 @@ findtwixt(struct got_object_id ***res, int *nres, int 
 		err = queue_commit_or_tag_id(id, COLOR_DROP, &ids, repo);
 		if (err)
 			goto done;
+		nqueued++;
 	}
 
-	err = got_pack_paint_commits(ncolored, &ids, nhead + ntail,
+	err = got_pack_paint_commits(ncolored, &ids, nqueued,
 	    keep, drop, skip, repo, progress_cb, progress_arg, rl,
 	    cancel_cb, cancel_arg);
 	if (err)