Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken regexp that matches submodule names containing ".path"

Browse Source 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
This commit is contained in:
Sven Strickroth
2024-02-24 15:18:42 +01:00
parent 8fd4f83e8a
commit 2f6c4f75e3
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libgit2/submodule.c
View File

@@ -196,7 +196,7 @@ static void free_submodule_names(git_strmap *names)
*/
static int load_submodule_names(git_strmap **out, git_repository *repo, git_config *cfg)
{
const char *key = "submodule\\..*\\.path";
const char *key = "^submodule\\..*\\.path$";
git_config_iterator *iter = NULL;
git_config_entry *entry;
git_str buf = GIT_STR_INIT;
@@ -332,7 +332,7 @@ int git_submodule__lookup_with_cache(
/* If it's not configured or we're looking by path */
if (location == 0 || location == GIT_SUBMODULE_STATUS_IN_WD) {
git_config_backend *mods;
const char *pattern = "submodule\\..*\\.path";
const char *pattern = "^submodule\\..*\\.path$";
git_str path = GIT_STR_INIT;
fbp_data data = { NULL, NULL };

18
tests/libgit2/submodule/lookup.c
View File

@@ -401,6 +401,24 @@ void test_submodule_lookup__prefix_name(void)
git_submodule_free(sm);
}
/* ".path" in name of submodule */
void test_submodule_lookup__dotpath_in_name(void)
{
sm_lookup_data data;
cl_git_rewritefile(
"submod2/.gitmodules", "[submodule \"kwb.pathdict\"]\n"
" path = kwb.pathdict\n"
" url = ../Test_App\n"
"[submodule \"fakin.path.app\"]\n"
" path = fakin.path.app\n"
" url = ../Test_App\n");
memset(&data, 0, sizeof(data));
cl_git_pass(git_submodule_foreach(g_repo, sm_lookup_cb, &data));
cl_assert_equal_i(9, data.count);
}
void test_submodule_lookup__renamed(void)
{
const char *newpath = "sm_actually_changed";