diff options
| author | Ben Straub <bs@github.com> | 2012-10-18 14:04:14 -0700 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2012-10-19 19:36:22 -0700 |
| commit | 30a46ab1a9464fe92860b29306efb99e50c0d226 (patch) | |
| tree | 0ea477cfb79bed5c12375eec74e8a16e599688f7 | |
| parent | aa1e86741dcd314212f738b408e507de1771fedd (diff) | |
| download | libgit2-30a46ab1a9464fe92860b29306efb99e50c0d226.tar.gz | |
Adjust for rebase
| -rw-r--r-- | src/checkout.c | 2 | ||||
| -rw-r--r-- | tests-clar/checkout/typechange.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/checkout.c b/src/checkout.c index 155ac5ac1..d9b3246b8 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 f013617d5..e86af52ee 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); |