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

gitster · gitster · commit 2acf3658a312 · 2010-08-31T16:25:29.000-07:00
* da/fix-submodule-sync-superproject-config:
  submodule sync: Update "submodule.&lt;name&gt;.url"
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)"
 	)
 '
 

Original file line number	Diff line number	Diff line change
`@@ -839,10 +839,11 @@ cmd_sync()`
`839`	`839`	`if test -e "$path"/.git`
`840`	`840`	`then`
`841`	`841`	`(`
	`842`	`+ say "Synchronizing submodule url for '$name'"`
	`843`	`+ git config submodule."$name".url "$url"`
`842`	`844`	`clear_local_git_env`
`843`	`845`	`cd "$path"`
`844`	`846`	`remote=$(get_default_remote)`
`845`		`- say "Synchronizing submodule url for '$name'"`
`846`	`847`	`git config remote."$remote".url "$url"`
`847`	`848`	`)`
`848`	`849`	`fi`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,9 @@ test_expect_success '"git submodule sync" should update submodule URLs' '`
`58`	`58`	`(cd super-clone/submodule &&`
`59`	`59`	`git checkout master &&`
`60`	`60`	`git pull`
	`61`	`+ ) &&`
	`62`	`+ (cd super-clone &&`
	`63`	`+ test -d "$(git config submodule.submodule.url)"`
`61`	`64`	`)`
`62`	`65`	`'`
`63`	`66`