Commit Diff

Commit:
e07c178232d764c5a0518412c4a9348e6d24cfc1
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
pass the right callback argument for check_mixed_commits
Actions:
Patch | Tree
commit - 473418ff6b31540646354b031a2628bfc8e61f66
commit + e07c178232d764c5a0518412c4a9348e6d24cfc1
blob - d4aed4f6bf14dbd91a5d5efb9d4479dcd6164ec4
blob + c2e52f2b6af12e7f6d173ad130885b820fa1bd5e
--- lib/worktree.c
+++ lib/worktree.c
@@ -8463,7 +8463,7 @@ got_worktree_merge_branch(struct got_worktree *worktre
 	cma.cancel_arg = cancel_arg;
 
 	err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
-	    worktree);
+	    &cma);
 	if (err)
 		goto done;