proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-21 16:56:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3286 from libgit2/cmn/submodule-duplicate

Browse Source 
Correctly delimit the keys for submodule lookup
This commit is contained in:
Carlos Martín Nieto 2015-07-02 08:35:05 +02:00
commit eb94199fe4
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/submodule.c
View File

@ -1385,7 +1385,7 @@ int git_submodule_reload(git_submodule *sm, int force)
git_buf_sets(&path, "submodule\\."); git_buf_sets(&path, "submodule\\.");
git_buf_text_puts_escape_regex(&path, sm->name); git_buf_text_puts_escape_regex(&path, sm->name);
git_buf_puts(&path, ".*"); git_buf_puts(&path, "\\..*");
if (git_buf_oom(&path)) { if (git_buf_oom(&path)) {
error = -1; error = -1;

23
tests/submodule/lookup.c
View File

@ -269,3 +269,26 @@ void test_submodule_lookup__just_added(void)
refute_submodule_exists(g_repo, "sm_just_added_head", GIT_EEXISTS); refute_submodule_exists(g_repo, "sm_just_added_head", GIT_EEXISTS);
} }
/* Test_App and Test_App2 are fairly similar names, make sure we load the right one */
void test_submodule_lookup__prefix_name(void)
{
git_submodule *sm;
cl_git_rewritefile("submod2/.gitmodules",
"[submodule \"Test_App\"]\n"
" path = Test_App\n"
" url = ../Test_App\n"
"[submodule \"Test_App2\"]\n"
" path = Test_App2\n"
" url = ../Test_App\n");
cl_git_pass(git_submodule_lookup(&sm, g_repo, "Test_App"));
cl_assert_equal_s("Test_App", git_submodule_name(sm));
git_submodule_free(sm);
cl_git_pass(git_submodule_lookup(&sm, g_repo, "Test_App2"));
cl_assert_equal_s("Test_App2", git_submodule_name(sm));
git_submodule_free(sm);
}