Merge branch 'da/fix-submodule-sync-superproject-config'

* da/fix-submodule-sync-superproject-config: submodule sync: Update "submodule.<name>.url"
git-mirror · Aug 31, 2010 · 2acf365 · 2acf365
2 parents ae76cb9 + 0b9dca4
commit 2acf365
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/git-submodule.sh b/git-submodule.sh
@@ -839,10 +839,11 @@ cmd_sync()
 		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)
-			say "Synchronizing submodule url for '$name'"
 			git config remote."$remote".url "$url"
 		)
 		fi

diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
@@ -58,6 +58,9 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
 	(cd super-clone/submodule &&
 	 git checkout master &&
 	 git pull
+	) &&
+	(cd super-clone &&
+	 test -d "$(git config submodule.submodule.url)"
 	)
 '