mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
Download Patch File Download Diff File Expand all files Collapse all files

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