Commit 30a46ab1a9464fe92860b29306efb99e50c0d226

Ben Straub 2012-10-18T14:04:14

Adjust for rebase

diff --git a/src/checkout.c b/src/checkout.c
index 155ac5a..d9b3246 100644
--- 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 f013617..e86af52 100644
--- 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);