mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/submodule-module-list-fix'

Browse Source 
A helper function "git submodule" uses since v2.7.0 to list the
modules that match the pathspec argument given to its subcommands
(e.g. "submodule add <repo> <path>") has been fixed.

* sb/submodule-module-list-fix:
  submodule helper list: respect correct path prefix
This commit is contained in:
Junio C Hamano
2016-02-26 13:37:24 -08:00
parent c6b94eb009 2b56bb7a87
commit 03f682bf74
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