From: W. Trevor King Date: Thu, 16 Jan 2014 04:10:25 GMT Subject: [PATCH v4 4/6] t7406: Just-cloned checkouts update to the gitlinked hash with 'reset' Message-ID: <09008c79ecc7d4fd92131b4049a25e65db92a30d.1389837412.git.wking@tremily.us> In-Reply-To: <20140114224246.GA13271@book.hvoigt.net> To preserve the local branch, for situations where we're not on a detached HEAD. Signed-off-by: W. Trevor King --- t/t7406-submodule-update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 0825a92..5aa9591 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -703,7 +703,7 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re git clone super_update_r super_update_r2 && (cd super_update_r2 && git submodule update --init --recursive >actual && - test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual && + test_i18ngrep "Submodule path .submodule/subsubmodule.: .git reset --hard -q" actual && (cd submodule/subsubmodule && git log > ../../expected ) && -- 1.8.5.2.8.g0f6c0d1