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

Merge pull request #1238 from nulltoken/fix/checkout-index

Browse Source 
checkout: Teach checkout to cope with orphaned Head
This commit is contained in:
Russell Belfer 2013-01-15 09:46:50 -08:00
commit 230010d19b
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/checkout.c
View File

@ -1173,7 +1173,14 @@ static int checkout_data_init(
if (!data->opts.baseline) { if (!data->opts.baseline) {
data->opts_free_baseline = true; data->opts_free_baseline = true;
if ((error = checkout_lookup_head_tree(&data->opts.baseline, repo)) < 0) error = checkout_lookup_head_tree(&data->opts.baseline, repo);
if (error == GIT_EORPHANEDHEAD) {
error = 0;
giterr_clear();
}
if (error < 0)
goto cleanup; goto cleanup;
} }

4
src/diff_output.c
View File

@ -842,7 +842,7 @@ static int diff_patch_line_cb(
{ {
git_diff_patch *patch = payload; git_diff_patch *patch = payload;
diff_patch_hunk *hunk; diff_patch_hunk *hunk;
diff_patch_line *last, *line; diff_patch_line *line;
GIT_UNUSED(delta); GIT_UNUSED(delta);
GIT_UNUSED(range); GIT_UNUSED(range);
@ -872,8 +872,6 @@ static int diff_patch_line_cb(
patch->lines_asize = new_size; patch->lines_asize = new_size;
} }
last = (patch->lines_size > 0) ?
&patch->lines[patch->lines_size - 1] : NULL;
line = &patch->lines[patch->lines_size++]; line = &patch->lines[patch->lines_size++];
line->ptr = content; line->ptr = content;

10
tests-clar/checkout/index.c
View File

@ -498,3 +498,13 @@ void test_checkout_index__can_update_prefixed_files(void)
cl_assert(!git_path_exists("testrepo/branch_file")); cl_assert(!git_path_exists("testrepo/branch_file"));
cl_assert(!git_path_exists("testrepo/branch_file.txt.after")); cl_assert(!git_path_exists("testrepo/branch_file.txt.after"));
} }
void test_checkout_index__can_checkout_a_newly_initialized_repository(void)
{
test_checkout_index__cleanup();
g_repo = cl_git_sandbox_init("empty_standard_repo");
cl_git_remove_placeholders(git_repository_path(g_repo), "dummy-marker.txt");
cl_git_pass(git_checkout_index(g_repo, NULL, NULL));
}

5
tests-clar/checkout/tree.c
View File

@ -367,7 +367,6 @@ void assert_conflict(
git_object *hack_tree; git_object *hack_tree;
git_reference *branch, *head; git_reference *branch, *head;
git_buf file_path = GIT_BUF_INIT; git_buf file_path = GIT_BUF_INIT;
git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
cl_git_pass(git_repository_index(&index, g_repo)); cl_git_pass(git_repository_index(&index, g_repo));
@ -383,7 +382,7 @@ void assert_conflict(
git_reference_free(branch); git_reference_free(branch);
/* Checkout the parent */ /* Checkout the parent */
opts.checkout_strategy = GIT_CHECKOUT_FORCE; g_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts));
/* Hack-ishy workaound to ensure *all* the index entries /* Hack-ishy workaound to ensure *all* the index entries
@ -403,7 +402,7 @@ void assert_conflict(
/* Trying to checkout the original commit */ /* Trying to checkout the original commit */
cl_git_pass(git_revparse_single(&g_object, g_repo, commit_sha)); cl_git_pass(git_revparse_single(&g_object, g_repo, commit_sha));
opts.checkout_strategy = GIT_CHECKOUT_SAFE; g_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
cl_assert_equal_i( cl_assert_equal_i(
GIT_EMERGECONFLICT, git_checkout_tree(g_repo, g_object, &g_opts)); GIT_EMERGECONFLICT, git_checkout_tree(g_repo, g_object, &g_opts));