Commit Diff


commit - ecf5ec81c7523d0ea634926b0221655d71bb3a05360b5aa0b9006b654131557e
commit + 1713708d4d22ed45a4bd7cbd93038c02bdecdd39dbdffdd2713969ea190e435b
blob - b39284433eb64fa70b8ea8f155becc6907818692f78b8f5605f819e1d38a4a5c
blob + 7733672abd4b7f0ad595c372b8fb59e5a88ccd196b44d72cc55f6dd3c7105e13
--- libexec/got-read-pack/got-read-pack.c	
+++ libexec/got-read-pack/got-read-pack.c	
@@ -1688,13 +1688,18 @@ repaint_parent_commits(struct got_object_id *commit_id
     struct got_pack *pack, struct got_packidx *packidx,
     struct got_object_cache *objcache)
 {
-	const struct got_error *err;
+	const struct got_error *err = NULL;
 	const struct got_object_id_queue *parents;
-	struct got_commit_object *commit;
+	struct got_commit_object *commit = NULL;
 	struct got_object_id_queue repaint;
+	struct got_object_idset *traversed;
 
 	STAILQ_INIT(&repaint);
 
+	traversed = got_object_idset_alloc();
+	if (traversed == NULL)
+		return got_error_from_errno("got_object_idset_alloc");
+
 	err = open_commit(&commit, pack, packidx, commit_idx, commit_id,
 	    objcache);
 	if (err)
@@ -1722,10 +1727,17 @@ repaint_parent_commits(struct got_object_id *commit_id
 				    got_object_idset_contains(skip, &pid->id))
 					continue;
 
+				if (got_object_idset_contains(traversed,
+				    &pid->id))
+					continue;
 				err = queue_commit_id(&repaint, &pid->id,
 				    color);
 				if (err)
 					goto done;
+				err = got_object_idset_add(traversed,
+				    &pid->id, NULL);
+				if (err)
+					goto done;
 			}
 		}
 		got_object_commit_close(commit);
@@ -1793,6 +1805,7 @@ done:
 	if (commit)
 		got_object_commit_close(commit);
 	got_object_id_queue_free(&repaint);
+	got_object_idset_free(traversed);
 
 	return err;
 }