development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

submodule helper list: respect correct path prefix

Browse source 
This is a regression introduced by 74703a1e4d (submodule: rewrite
`module_list` shell function in C, 2015-09-02).

Add a test to ensure we list the right submodule when giving a
specific pathspec.

Reported-By: Caleb Jorden <cjorden@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2016-02-24 13:15:02 -08:00 committed by Junio C Hamano
parent 754884255b
commit 2b56bb7a87
2 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
builtin/submodule--helper.c
View file

@ -22,17 +22,12 @@ static int module_list_compute(int argc, const char **argv,
struct module_list *list) struct module_list *list)
{ {
int i, result = 0; int i, result = 0;
char *max_prefix, *ps_matched = NULL; char *ps_matched = NULL;
int max_prefix_len;
parse_pathspec(pathspec, 0, parse_pathspec(pathspec, 0,
PATHSPEC_PREFER_FULL | PATHSPEC_PREFER_FULL |
PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP, PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
prefix, argv); prefix, argv);
/* Find common prefix for all pathspec's */
max_prefix = common_prefix(pathspec);
max_prefix_len = max_prefix ? strlen(max_prefix) : 0;
if (pathspec->nr) if (pathspec->nr)
ps_matched = xcalloc(pathspec->nr, 1); ps_matched = xcalloc(pathspec->nr, 1);
@ -44,7 +39,7 @@ static int module_list_compute(int argc, const char **argv,
if (!S_ISGITLINK(ce->ce_mode) || if (!S_ISGITLINK(ce->ce_mode) ||
!match_pathspec(pathspec, ce->name, ce_namelen(ce), !match_pathspec(pathspec, ce->name, ce_namelen(ce),
max_prefix_len, ps_matched, 1)) 0, ps_matched, 1))
continue; continue;
ALLOC_GROW(list->entries, list->nr + 1, list->alloc); ALLOC_GROW(list->entries, list->nr + 1, list->alloc);
@ -57,7 +52,6 @@ static int module_list_compute(int argc, const char **argv,
*/ */
i++; i++;
} }
free(max_prefix);
if (ps_matched && report_path_error(ps_matched, pathspec, prefix)) if (ps_matched && report_path_error(ps_matched, pathspec, prefix))
result = -1; result = -1;

25
t/t7400-submodule-basic.sh
View file

@ -999,5 +999,30 @@ test_expect_success 'submodule add clone shallow submodule' '
) )
' '
test_expect_success 'submodule helper list is not confused by common prefixes' '
mkdir -p dir1/b &&
(
cd dir1/b &&
git init &&
echo hi >testfile2 &&
git add . &&
git commit -m "test1"
) &&
mkdir -p dir2/b &&
(
cd dir2/b &&
git init &&
echo hello >testfile1 &&
git add . &&
git commit -m "test2"
) &&
git submodule add /dir1/b dir1/b &&
git submodule add /dir2/b dir2/b &&
git commit -m "first submodule commit" &&
git submodule--helper list dir1/b |cut -c51- >actual &&
echo "dir1/b" >expect &&
test_cmp expect actual
'
test_done test_done