From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Jul 2012 19:56:25 +0000 (-0700)
Subject: Merge branch 'dg/submodule-in-dismembered-working-tree'
X-Git-Tag: v1.7.12-rc1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8de8bb805117f82bc027310c1157b65b2748596e?ds=inline;hp=-c

Merge branch 'dg/submodule-in-dismembered-working-tree'

Finishing touches to the new test script.

* dg/submodule-in-dismembered-working-tree:
t7409: make sure submodule is initialized and updated in more detail
---

8de8bb805117f82bc027310c1157b65b2748596e
diff --combined t/t7409-submodule-detached-worktree.sh
index db75642fc3,2fec13dcd3..2fec13dcd3
mode 100755,100644..100755
--- a/t/t7409-submodule-detached-worktree.sh
+++ b/t/t7409-submodule-detached-worktree.sh
@@@ -15,7 -15,11 +15,11 @@@ TEST_NO_CREATE_REPO=
  test_expect_success 'submodule on detached working tree' '
  	git init --bare remote &&
  	test_create_repo bundle1 &&
- 	(cd bundle1 && test_commit "shoot") &&
+ 	(
+ 		cd bundle1 &&
+ 		test_commit "shoot" &&
+ 		git rev-parse --verify HEAD >../expect
+ 	) &&
  	mkdir home &&
  	(
  		cd home &&
@@@ -23,14 -27,27 +27,27 @@@
  		git clone --bare ../remote .dotfiles &&
  		git submodule add ../bundle1 .vim/bundle/sogood &&
  		test_commit "sogood" &&
+ 		(
+ 			unset GIT_WORK_TREE GIT_DIR &&
+ 			cd .vim/bundle/sogood &&
+ 			git rev-parse --verify HEAD >actual &&
+ 			test_cmp ../../../../expect actual
+ 		) &&
  		git push origin master
  	) &&
  	mkdir home2 &&
  	(
  		cd home2 &&
- 		export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
  		git clone --bare ../remote .dotfiles &&
- 		git submodule update --init
+ 		export GIT_WORK_TREE="$(pwd)" GIT_DIR="$(pwd)/.dotfiles" &&
+ 		git checkout master &&
+ 		git submodule update --init &&
+ 		(
+ 			unset GIT_WORK_TREE GIT_DIR &&
+ 			cd .vim/bundle/sogood &&
+ 			git rev-parse --verify HEAD >actual &&
+ 			test_cmp ../../../../expect actual
+ 		)
  	)
  '
  
@@@ -42,6 -59,7 +59,7 @@@ test_expect_success 'submodule on detac
  		git clone --bare ../remote "$GIT_DIR" &&
  		git config core.bare false &&
  		git config core.worktree .. &&
+ 		git checkout master &&
  		git submodule add ../bundle1 .vim/bundle/dupe &&
  		test_commit "dupe" &&
  		git push origin master
@@@ -52,9 -70,8 +70,8 @@@
  		git config core.bare false &&
  		git config core.worktree .. &&
  		git pull &&
- 		git submodule update &&
- 		git submodule status &&
- 		test -d .vim/bundle/dupe
+ 		git submodule update --init &&
+ 		test -f .vim/bundle/dupe/shoot.t
  	)
  '