Skip to content

G
git2
Commit 1cac688d by Carlos Martín Nieto
Options

Merge pull request #3719 from libgit2/ethomson/submodule_status 

WD iterator: properly identify submodules
parents 24ecf18e 4df6ddaa
Showing with 454 additions and 1 deletions
src/iterator.c
...@@ -34,7 +34,7 @@ static void iterator_set_ignore_case(git_iterator *iter, bool ignore_case) ...@@ -34,7 +34,7 @@ static void iterator_set_ignore_case(git_iterator *iter, bool ignore_case)
iter->strcomp = ignore_case ? git__strcasecmp : git__strcmp; iter->strcomp = ignore_case ? git__strcasecmp : git__strcmp;
iter->strncomp = ignore_case ? git__strncasecmp : git__strncmp; iter->strncomp = ignore_case ? git__strncasecmp : git__strncmp;
iter->prefixcomp = ignore_case ? git__prefixcmp_icase : git__prefixcmp; iter->prefixcomp = ignore_case ? git__prefixcmp_icase : git__prefixcmp;
iter->entry_srch = ignore_case ? git_index_entry_srch : git_index_entry_isrch; iter->entry_srch = ignore_case ? git_index_entry_isrch : git_index_entry_srch;
git_vector_set_cmp(&iter->pathlist, (git_vector_cmp)iter->strcomp); git_vector_set_cmp(&iter->pathlist, (git_vector_cmp)iter->strcomp);
} }
......
tests/resources/submod3/.gitted/config 0 → 100644
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[submodule "One"]
url = ../submod2_target
[submodule "TWO"]
url = ../submod2_target
[submodule "three"]
url = ../submod2_target
[submodule "FoUr"]
url = ../submod2_target
[submodule "Five"]
url = ../submod2_target
[submodule "six"]
url = ../submod2_target
[submodule "sEvEn"]
url = ../submod2_target
[submodule "EIGHT"]
url = ../submod2_target
[submodule "nine"]
url = ../submod2_target
[submodule "TEN"]
url = ../submod2_target
tests/resources/submod3/.gitted/modules/EIGHT/config 0 → 100755
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
worktree = ../../../EIGHT
[remote "origin"]
url = /tmp/libgit2_tests_5hR8uP/submod2_target
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
tests/resources/submod3/.gitted/modules/EIGHT/packed-refs 0 → 100644
# pack-refs with: peeled fully-peeled
480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master
tests/resources/submod3/.gitted/modules/Five/config 0 → 100755
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
worktree = ../../../Five
[remote "origin"]
url = /tmp/libgit2_tests_5hR8uP/submod2_target
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
tests/resources/submod3/.gitted/modules/Five/packed-refs 0 → 100644
# pack-refs with: peeled fully-peeled
480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master
tests/resources/submod3/.gitted/modules/FoUr/config 0 → 100755
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
worktree = ../../../FoUr
[remote "origin"]
url = /tmp/libgit2_tests_5hR8uP/submod2_target
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
tests/resources/submod3/.gitted/modules/FoUr/packed-refs 0 → 100644
# pack-refs with: peeled fully-peeled
480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master
tests/resources/submod3/.gitted/modules/One/config 0 → 100755
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
worktree = ../../../One
[remote "origin"]
url = /tmp/libgit2_tests_5hR8uP/submod2_target
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
tests/resources/submod3/.gitted/modules/One/packed-refs 0 → 100644
# pack-refs with: peeled fully-peeled
480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master
tests/resources/submod3/.gitted/modules/TEN/config 0 → 100755
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
worktree = ../../../TEN
[remote "origin"]
url = /tmp/libgit2_tests_5hR8uP/submod2_target
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
tests/resources/submod3/.gitted/modules/TEN/packed-refs 0 → 100644
# pack-refs with: peeled fully-peeled
480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master
tests/resources/submod3/.gitted/modules/TWO/config 0 → 100755
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
worktree = ../../../TWO
[remote "origin"]
url = /tmp/libgit2_tests_5hR8uP/submod2_target
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
tests/resources/submod3/.gitted/modules/TWO/packed-refs 0 → 100644
# pack-refs with: peeled fully-peeled
480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master
tests/resources/submod3/.gitted/modules/nine/config 0 → 100755
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
worktree = ../../../nine
[remote "origin"]
url = /tmp/libgit2_tests_5hR8uP/submod2_target
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
tests/resources/submod3/.gitted/modules/nine/packed-refs 0 → 100644
# pack-refs with: peeled fully-peeled
480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master
tests/resources/submod3/.gitted/modules/sEvEn/config 0 → 100755
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
worktree = ../../../sEvEn
[remote "origin"]
url = /tmp/libgit2_tests_5hR8uP/submod2_target
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
tests/resources/submod3/.gitted/modules/sEvEn/packed-refs 0 → 100644
# pack-refs with: peeled fully-peeled
480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master
tests/resources/submod3/.gitted/modules/six/config 0 → 100755
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
worktree = ../../../six
[remote "origin"]
url = /tmp/libgit2_tests_5hR8uP/submod2_target
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
tests/resources/submod3/.gitted/modules/six/packed-refs 0 → 100644
# pack-refs with: peeled fully-peeled
480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master
tests/resources/submod3/.gitted/modules/three/config 0 → 100755
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
worktree = ../../../three
[remote "origin"]
url = /tmp/libgit2_tests_5hR8uP/submod2_target
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
tests/resources/submod3/.gitted/modules/three/packed-refs 0 → 100644
# pack-refs with: peeled fully-peeled
480095882d281ed676fe5b863569520e54a7d5c0 refs/remotes/origin/master
tests/resources/submod3/.gitted/refs/heads/master 0 → 100644
90459b51713bde15eb97852ff22c29270752b432
tests/resources/submod3/EIGHT/.gitted 0 → 100644
gitdir: ../.git/modules/EIGHT
tests/resources/submod3/EIGHT/README.txt 0 → 100644
This is the target for submod2 submodule links.
Don't add commits casually because you make break tests.
tests/resources/submod3/EIGHT/file_to_modify 0 → 100644
This is a file to modify in submodules
It already has some history.
You can add local changes as needed.
tests/resources/submod3/Five/.gitted 0 → 100644
gitdir: ../.git/modules/Five
tests/resources/submod3/Five/README.txt 0 → 100644
This is the target for submod2 submodule links.
Don't add commits casually because you make break tests.
tests/resources/submod3/Five/file_to_modify 0 → 100644
This is a file to modify in submodules
It already has some history.
You can add local changes as needed.
tests/resources/submod3/FoUr/.gitted 0 → 100644
gitdir: ../.git/modules/FoUr
tests/resources/submod3/FoUr/README.txt 0 → 100644
This is the target for submod2 submodule links.
Don't add commits casually because you make break tests.
tests/resources/submod3/FoUr/file_to_modify 0 → 100644
This is a file to modify in submodules
It already has some history.
You can add local changes as needed.
tests/resources/submod3/One/.gitted 0 → 100644
gitdir: ../.git/modules/One
tests/resources/submod3/One/README.txt 0 → 100644
This is the target for submod2 submodule links.
Don't add commits casually because you make break tests.
tests/resources/submod3/One/file_to_modify 0 → 100644
This is a file to modify in submodules
It already has some history.
You can add local changes as needed.
tests/resources/submod3/TEN/.gitted 0 → 100644
gitdir: ../.git/modules/TEN
tests/resources/submod3/TEN/README.txt 0 → 100644
This is the target for submod2 submodule links.
Don't add commits casually because you make break tests.
tests/resources/submod3/TEN/file_to_modify 0 → 100644
This is a file to modify in submodules
It already has some history.
You can add local changes as needed.
tests/resources/submod3/TWO/.gitted 0 → 100644
gitdir: ../.git/modules/TWO
tests/resources/submod3/TWO/README.txt 0 → 100644
This is the target for submod2 submodule links.
Don't add commits casually because you make break tests.
tests/resources/submod3/TWO/file_to_modify 0 → 100644
This is a file to modify in submodules
It already has some history.
You can add local changes as needed.
tests/resources/submod3/gitmodules 0 → 100644
[submodule "One"]
path = One
url = /tmp/libgit2_tests_XJLtEE/submod2_target
[submodule "TWO"]
path = TWO
url = /tmp/libgit2_tests_XJLtEE/submod2_target
[submodule "three"]
path = three
url = /tmp/libgit2_tests_XJLtEE/submod2_target
[submodule "FoUr"]
path = FoUr
url = /tmp/libgit2_tests_XJLtEE/submod2_target
[submodule "Five"]
path = Five
url = /tmp/libgit2_tests_XJLtEE/submod2_target
[submodule "six"]
path = six
url = /tmp/libgit2_tests_XJLtEE/submod2_target
[submodule "sEvEn"]
path = sEvEn
url = /tmp/libgit2_tests_XJLtEE/submod2_target
[submodule "EIGHT"]
path = EIGHT
url = /tmp/libgit2_tests_XJLtEE/submod2_target
[submodule "nine"]
path = nine
url = /tmp/libgit2_tests_XJLtEE/submod2_target
[submodule "TEN"]
path = TEN
url = /tmp/libgit2_tests_XJLtEE/submod2_target
tests/resources/submod3/nine/.gitted 0 → 100644
gitdir: ../.git/modules/nine
tests/resources/submod3/nine/README.txt 0 → 100644
This is the target for submod2 submodule links.
Don't add commits casually because you make break tests.
tests/resources/submod3/nine/file_to_modify 0 → 100644
This is a file to modify in submodules
It already has some history.
You can add local changes as needed.
tests/resources/submod3/sEvEn/.gitted 0 → 100644
gitdir: ../.git/modules/sEvEn
tests/resources/submod3/sEvEn/README.txt 0 → 100644
This is the target for submod2 submodule links.
Don't add commits casually because you make break tests.
tests/resources/submod3/sEvEn/file_to_modify 0 → 100644
This is a file to modify in submodules
It already has some history.
You can add local changes as needed.
tests/resources/submod3/six/.gitted 0 → 100644
gitdir: ../.git/modules/six
tests/resources/submod3/six/README.txt 0 → 100644
This is the target for submod2 submodule links.
Don't add commits casually because you make break tests.
tests/resources/submod3/six/file_to_modify 0 → 100644
This is a file to modify in submodules
It already has some history.
You can add local changes as needed.
tests/resources/submod3/three/.gitted 0 → 100644
gitdir: ../.git/modules/three
tests/resources/submod3/three/README.txt 0 → 100644
This is the target for submod2 submodule links.
Don't add commits casually because you make break tests.
tests/resources/submod3/three/file_to_modify 0 → 100644
This is a file to modify in submodules
It already has some history.
You can add local changes as needed.
tests/status/submodules.c
...@@ -524,3 +524,40 @@ void test_status_submodules__entry_but_dir_tracked(void) ...@@ -524,3 +524,40 @@ void test_status_submodules__entry_but_dir_tracked(void)
git_tree_free(tree); git_tree_free(tree);
git_repository_free(repo); git_repository_free(repo);
} }
void test_status_submodules__mixed_case(void)
{
git_status_list *status;
git_status_options status_opts = GIT_STATUS_OPTIONS_INIT;
const git_status_entry *s;
size_t i;
status_opts.flags =
GIT_STATUS_OPT_INCLUDE_UNTRACKED |
GIT_STATUS_OPT_INCLUDE_IGNORED |
GIT_STATUS_OPT_INCLUDE_UNMODIFIED |
GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS |
GIT_STATUS_OPT_RECURSE_IGNORED_DIRS |
GIT_STATUS_OPT_RENAMES_HEAD_TO_INDEX |
GIT_STATUS_OPT_RENAMES_INDEX_TO_WORKDIR |
GIT_STATUS_OPT_RENAMES_FROM_REWRITES |
GIT_STATUS_OPT_INCLUDE_UNREADABLE |
GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED;
g_repo = setup_fixture_submod3();
cl_git_pass(git_status_list_new(&status, g_repo, &status_opts));
for (i = 0; i < git_status_list_entrycount(status); i++) {
s = git_status_byindex(status, i);
if (s->head_to_index &&
strcmp(s->head_to_index->old_file.path, ".gitmodules") == 0)
continue;
cl_assert_equal_i(0, s->status);
}
git_status_list_free(status);
}
tests/submodule/submodule_helpers.c
...@@ -126,6 +126,32 @@ git_repository *setup_fixture_submod2(void) ...@@ -126,6 +126,32 @@ git_repository *setup_fixture_submod2(void)
return repo; return repo;
} }
git_repository *setup_fixture_submod3(void)
{
git_repository *repo = cl_git_sandbox_init("submod3");
cl_fixture_sandbox("submod2_target");
p_rename("submod2_target/.gitted", "submod2_target/.git");
rewrite_gitmodules(git_repository_workdir(repo));
p_rename("submod3/One/.gitted", "submod3/One/.git");
p_rename("submod3/TWO/.gitted", "submod3/TWO/.git");
p_rename("submod3/three/.gitted", "submod3/three/.git");
p_rename("submod3/FoUr/.gitted", "submod3/FoUr/.git");
p_rename("submod3/Five/.gitted", "submod3/Five/.git");
p_rename("submod3/six/.gitted", "submod3/six/.git");
p_rename("submod3/sEvEn/.gitted", "submod3/sEvEn/.git");
p_rename("submod3/EIGHT/.gitted", "submod3/EIGHT/.git");
p_rename("submod3/nine/.gitted", "submod3/nine/.git");
p_rename("submod3/TEN/.gitted", "submod3/TEN/.git");
cl_set_cleanup(cleanup_fixture_submodules, "submod2_target");
cl_git_pass(git_repository_reinit_filesystem(repo, 1));
return repo;
}
git_repository *setup_fixture_super(void) git_repository *setup_fixture_super(void)
{ {
git_repository *repo = cl_git_sandbox_init("super"); git_repository *repo = cl_git_sandbox_init("super");
......
tests/submodule/submodule_helpers.h
...@@ -3,6 +3,7 @@ extern void rewrite_gitmodules(const char *workdir); ...@@ -3,6 +3,7 @@ extern void rewrite_gitmodules(const char *workdir);
/* these will automatically set a cleanup callback */ /* these will automatically set a cleanup callback */
extern git_repository *setup_fixture_submodules(void); extern git_repository *setup_fixture_submodules(void);
extern git_repository *setup_fixture_submod2(void); extern git_repository *setup_fixture_submod2(void);
extern git_repository *setup_fixture_submod3(void);
extern git_repository *setup_fixture_submodule_simple(void); extern git_repository *setup_fixture_submodule_simple(void);
extern git_repository *setup_fixture_super(void); extern git_repository *setup_fixture_super(void);
extern git_repository *setup_fixture_submodule_with_path(void); extern git_repository *setup_fixture_submodule_with_path(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment