undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/submodule-re-add'

Browse Source 
* jl/submodule-re-add:
  submodule add: fix breakage when re-adding a deep submodule
This commit is contained in:
Junio C Hamano 2012-01-31 22:01:16 -08:00
commit 412a79f4cb
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-submodule.sh
View File

@ -131,6 +131,7 @@ module_clone()
gitdir= gitdir=
gitdir_base= gitdir_base=
name=$(module_name "$path" 2>/dev/null) name=$(module_name "$path" 2>/dev/null)
test -n "$name" || name="$path"
base_path=$(dirname "$path") base_path=$(dirname "$path")
gitdir=$(git rev-parse --git-dir) gitdir=$(git rev-parse --git-dir)

8
t/t7406-submodule-update.sh
View File

@ -611,4 +611,12 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
) )
' '
test_expect_success 'submodule add properly re-creates deeper level submodules' '
(cd super &&
git reset --hard master &&
rm -rf deeper/ &&
git submodule add ../submodule deeper/submodule
)
'
test_done test_done