Adjust for rebase

diff --git a/src/checkout.c b/src/checkout.c
index 155ac5ac19aea8812388f33c788831cf5fdcbca7..d9b3246b805c0b08320e59e13327f505a73502ff 100644 (file)
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -190,7 +190,6 @@ static int checkout_remove_the_old(
        git_checkout_opts *opts = data->checkout_opts;
 
        GIT_UNUSED(progress);
-       data->stats->processed++;
 
        if ((delta->status == GIT_DELTA_UNTRACKED &&
                 (opts->checkout_strategy & GIT_CHECKOUT_REMOVE_UNTRACKED) != 0) ||
@@ -221,7 +220,6 @@ static int checkout_create_the_new(
        bool do_checkout = false, do_notify = false;
 
        GIT_UNUSED(progress);
-       data->stats->processed++;
 
        if (delta->status == GIT_DELTA_MODIFIED ||
                delta->status == GIT_DELTA_TYPECHANGE)

diff --git a/tests-clar/checkout/typechange.c b/tests-clar/checkout/typechange.c
index f013617d5d348b5f335ef80d674a245ce9d61eb1..e86af52eeb0b908e1b956c2110712294f79702b8 100644 (file)
--- a/tests-clar/checkout/typechange.c
+++ b/tests-clar/checkout/typechange.c
@@ -49,7 +49,7 @@ void test_checkout_typechange__checkout_typechanges(void)
                cl_git_pass(git_revparse_single(&obj, g_repo, g_typechange_oids[i]));
                /* fprintf(stderr, "checking out '%s'\n", g_typechange_oids[i]); */
 
-               cl_git_pass(git_checkout_tree(g_repo, obj, &opts, NULL));
+               cl_git_pass(git_checkout_tree(g_repo, obj, &opts));
 
                git_object_free(obj);