commit d1c85b424404fbdc9500dcdf4ecf4b418bf5ec1f from: Omar Polo via: Thomas Adam date: Wed Jul 26 19:15:43 2023 UTC pass the right callback argument for check_mixed_commits commit - 1a3a193e01b5bb5d31702f55934b298b8b89a3b6 commit + d1c85b424404fbdc9500dcdf4ecf4b418bf5ec1f blob - 0b8df90d6178c4aba29b97a3104bc1795fe9bf1e blob + 0b6cb4282637a3f1b42cb14a1b93ebde18256b57 --- lib/worktree.c +++ lib/worktree.c @@ -8460,7 +8460,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;