proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 22:00:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust for rebase

Browse Source
This commit is contained in:
Ben Straub 2012-10-18 14:04:14 -07:00
parent aa1e86741d
commit 30a46ab1a9
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/checkout.c
View File

@ -190,7 +190,6 @@ static int checkout_remove_the_old(
git_checkout_opts *opts = data->checkout_opts; git_checkout_opts *opts = data->checkout_opts;
GIT_UNUSED(progress); GIT_UNUSED(progress);
data->stats->processed++;
if ((delta->status == GIT_DELTA_UNTRACKED && if ((delta->status == GIT_DELTA_UNTRACKED &&
(opts->checkout_strategy & GIT_CHECKOUT_REMOVE_UNTRACKED) != 0) || (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; bool do_checkout = false, do_notify = false;
GIT_UNUSED(progress); GIT_UNUSED(progress);
data->stats->processed++;
if (delta->status == GIT_DELTA_MODIFIED || if (delta->status == GIT_DELTA_MODIFIED ||
delta->status == GIT_DELTA_TYPECHANGE) delta->status == GIT_DELTA_TYPECHANGE)

2
tests-clar/checkout/typechange.c
View File

@ -49,7 +49,7 @@ void test_checkout_typechange__checkout_typechanges(void)
cl_git_pass(git_revparse_single(&obj, g_repo, g_typechange_oids[i])); cl_git_pass(git_revparse_single(&obj, g_repo, g_typechange_oids[i]));
/* fprintf(stderr, "checking out '%s'\n", 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); git_object_free(obj);