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

Merge branch 'sb/submodule-helper-clone-regression-fix' into maint

Browse Source 
A partial rewrite of "git submodule" in the 2.7 timeframe changed
the way the gitdir: pointer in the submodules point at the real
repository location to use absolute paths by accident.  This has
been corrected.

* sb/submodule-helper-clone-regression-fix:
  submodule--helper, module_clone: catch fprintf failure
  submodule--helper: do not borrow absolute_path() result for too long
  submodule--helper, module_clone: always operate on absolute paths
  submodule--helper clone: create the submodule path just once
  submodule--helper: fix potential NULL-dereference
  recursive submodules: test for relative paths
This commit is contained in:
Junio C Hamano
2016-05-02 14:24:08 -07:00
parent 75375ea337 1f15ba1f3c
commit f5e16b2a7b
2 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
t/t7400-submodule-basic.sh
View File

@ -818,6 +818,47 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano
)
'
test_expect_success 'recursive relative submodules stay relative' '
test_when_finished "rm -rf super clone2 subsub sub3" &&
mkdir subsub &&
(
cd subsub &&
git init &&
>t &&
git add t &&
git commit -m "initial commit"
) &&
mkdir sub3 &&
(
cd sub3 &&
git init &&
>t &&
git add t &&
git commit -m "initial commit" &&
git submodule add ../subsub dirdir/subsub &&
git commit -m "add submodule subsub"
) &&
mkdir super &&
(
cd super &&
git init &&
>t &&
git add t &&
git commit -m "initial commit" &&
git submodule add ../sub3 &&
git commit -m "add submodule sub"
) &&
git clone super clone2 &&
(
cd clone2 &&
git submodule update --init --recursive &&
echo "gitdir: ../.git/modules/sub3" >./sub3/.git_expect &&
echo "gitdir: ../../../.git/modules/sub3/modules/dirdir/subsub" >./sub3/dirdir/subsub/.git_expect
) &&
test_cmp clone2/sub3/.git_expect clone2/sub3/.git &&
test_cmp clone2/sub3/dirdir/subsub/.git_expect clone2/sub3/dirdir/subsub/.git
'
test_expect_success 'submodule add with an existing name fails unless forced' '
(
cd addtest2 &&