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

checkout: Mimic git_diff_options storage of paths

Browse Source
This commit is contained in:
nulltoken 2012-09-17 20:27:28 +02:00
parent 5e4cb4f4da
commit 397837197d
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/git2/checkout.h
View File

@ -39,7 +39,7 @@ typedef struct git_checkout_opts {
/* when not NULL, arrays of fnmatch pattern specifying /* when not NULL, arrays of fnmatch pattern specifying
* which paths should be taken into account * which paths should be taken into account
*/ */
git_strarray *paths; git_strarray paths;
} git_checkout_opts; } git_checkout_opts;
/** /**

6
src/checkout.c
View File

@ -282,10 +282,8 @@ int git_checkout_index(
diff_opts.flags = GIT_DIFF_INCLUDE_UNTRACKED; diff_opts.flags = GIT_DIFF_INCLUDE_UNTRACKED;
if (opts && opts->paths) { if (opts && opts->paths.count > 0)
diff_opts.pathspec.strings = opts->paths->strings; diff_opts.pathspec = opts->paths;
diff_opts.pathspec.count = opts->paths->count;
}
if ((error = git_diff_workdir_to_index(repo, &diff_opts, &diff)) < 0) if ((error = git_diff_workdir_to_index(repo, &diff_opts, &diff)) < 0)
goto cleanup; goto cleanup;

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

@ -102,12 +102,10 @@ void test_checkout_index__can_remove_untracked_files(void)
void test_checkout_index__honor_the_specified_pathspecs(void) void test_checkout_index__honor_the_specified_pathspecs(void)
{ {
git_strarray paths;
char *entries[] = { "*.txt" }; char *entries[] = { "*.txt" };
paths.strings = entries; g_opts.paths.strings = entries;
paths.count = 1; g_opts.paths.count = 1;
g_opts.paths = &paths;
cl_assert_equal_i(false, git_path_isfile("./testrepo/README")); cl_assert_equal_i(false, git_path_isfile("./testrepo/README"));
cl_assert_equal_i(false, git_path_isfile("./testrepo/branch_file.txt")); cl_assert_equal_i(false, git_path_isfile("./testrepo/branch_file.txt"));

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

@ -32,12 +32,10 @@ void test_checkout_tree__cannot_checkout_a_non_treeish(void)
void test_checkout_tree__can_checkout_a_subdirectory_from_a_commit(void) void test_checkout_tree__can_checkout_a_subdirectory_from_a_commit(void)
{ {
git_strarray paths;
char *entries[] = { "ab/de/" }; char *entries[] = { "ab/de/" };
paths.strings = entries; g_opts.paths.strings = entries;
paths.count = 1; g_opts.paths.count = 1;
g_opts.paths = &paths;
cl_git_pass(git_revparse_single(&g_object, g_repo, "subtrees")); cl_git_pass(git_revparse_single(&g_object, g_repo, "subtrees"));
@ -51,12 +49,10 @@ void test_checkout_tree__can_checkout_a_subdirectory_from_a_commit(void)
void test_checkout_tree__can_checkout_a_subdirectory_from_a_subtree(void) void test_checkout_tree__can_checkout_a_subdirectory_from_a_subtree(void)
{ {
git_strarray paths;
char *entries[] = { "de/" }; char *entries[] = { "de/" };
paths.strings = entries; g_opts.paths.strings = entries;
paths.count = 1; g_opts.paths.count = 1;
g_opts.paths = &paths;
cl_git_pass(git_revparse_single(&g_object, g_repo, "subtrees:ab")); cl_git_pass(git_revparse_single(&g_object, g_repo, "subtrees:ab"));