Commit Diff

Commit:
21a0da85073bec1c322c554d9bba1ffba5fdf66b
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
don't forget to call the cancel callback while coloring commits in findtwixt()
Actions:
Patch | Tree
commit - dd111f75ac7152b2586f2ded82db5e80083dda44
commit + 21a0da85073bec1c322c554d9bba1ffba5fdf66b
blob - 2985ff9af0964756d55c68c19780d8b9c208370e
blob + 6e3b92ab0fbe2a9a380fc01969f06b75b3861ad9
--- lib/pack_create.c
+++ lib/pack_create.c
@@ -1295,6 +1295,13 @@ findtwixt(struct got_object_id ***res, int *nres, int 
 
 	while (!STAILQ_EMPTY(&ids)) {
 		int qcolor;
+
+		if (cancel_cb) {
+			err = cancel_cb(cancel_arg);
+			if (err)
+				goto done;
+		}
+
 		qid = STAILQ_FIRST(&ids);
 		qcolor = *((int *)qid->data);