From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Aug 2010 23:25:29 +0000 (-0700)
Subject: Merge branch 'da/fix-submodule-sync-superproject-config'
X-Git-Tag: v1.7.3-rc0~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2acf3658a31249d1a09573e2b6870871b5323121?ds=inline;hp=-c

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

* da/fix-submodule-sync-superproject-config:
submodule sync: Update "submodule.<name>.url"
---

2acf3658a31249d1a09573e2b6870871b5323121
diff --combined t/t7403-submodule-sync.sh
index bade2179b1,3033c4a22d..02522f9627
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@@ -14,7 -14,7 +14,7 @@@ test_expect_success setup 
  	echo file > file &&
  	git add file &&
  	test_tick &&
 -	git commit -m upstream
 +	git commit -m upstream &&
  	git clone . super &&
  	git clone super submodule &&
  	(cd super &&
@@@ -42,7 -42,7 +42,7 @@@ test_expect_success 'change submodule u
  	) &&
  	mv submodule moved-submodule &&
  	(cd super &&
 -	 git config -f .gitmodules submodule.submodule.url ../moved-submodule
 +	 git config -f .gitmodules submodule.submodule.url ../moved-submodule &&
  	 test_tick &&
  	 git commit -a -m moved-submodule
  	)
@@@ -58,6 -58,9 +58,9 @@@ test_expect_success '"git submodule syn
  	(cd super-clone/submodule &&
  	 git checkout master &&
  	 git pull
+ 	) &&
+ 	(cd super-clone &&
+ 	 test -d "$(git config submodule.submodule.url)"
  	)
  '