提交 571e16d6 编写于 作者: J Junio C Hamano

Merge branch 'mt/parallel-checkout-part-1' into next

Parallel checkout.

* mt/parallel-checkout-part-1:
  parallel-checkout: drop unused checkout state parameter
......@@ -233,7 +233,7 @@ static int reset_fd(int fd, const char *path)
}
static int write_pc_item_to_fd(struct parallel_checkout_item *pc_item, int fd,
const char *path, struct checkout *state)
const char *path)
{
int ret;
struct stream_filter *filter;
......@@ -347,7 +347,7 @@ void write_pc_item(struct parallel_checkout_item *pc_item,
goto out;
}
if (write_pc_item_to_fd(pc_item, fd, path.buf, state)) {
if (write_pc_item_to_fd(pc_item, fd, path.buf)) {
/* Error was already reported. */
pc_item->status = PC_ITEM_FAILED;
goto out;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册