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 170 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
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