1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-04 16:27:54 +01:00

Merge branch 'ak/submodule-sync'

* ak/submodule-sync:
  submodule sync: Update "submodule.<name>.url" for empty directories
This commit is contained in:
Junio C Hamano 2010-11-17 14:59:54 -08:00
commit 734e0ba437
2 changed files with 14 additions and 3 deletions

View file

@ -836,11 +836,12 @@ cmd_sync()
;;
esac
say "Synchronizing submodule url for '$name'"
git config submodule."$name".url "$url"
if test -e "$path"/.git
then
(
say "Synchronizing submodule url for '$name'"
git config submodule."$name".url "$url"
clear_local_git_env
cd "$path"
remote=$(get_default_remote)

View file

@ -23,7 +23,9 @@ test_expect_success setup '
git commit -m "submodule"
) &&
git clone super super-clone &&
(cd super-clone && git submodule update --init)
(cd super-clone && git submodule update --init) &&
git clone super empty-clone &&
(cd empty-clone && git submodule init)
'
test_expect_success 'change submodule' '
@ -64,4 +66,12 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
)
'
test_expect_success '"git submodule sync" should update submodule URLs if not yet cloned' '
(cd empty-clone &&
git pull &&
git submodule sync &&
test -d "$(git config submodule.submodule.url)"
)
'
test_done