"W. Trevor King" <wk...@tremily.us> writes: > To preserve the local branch, for situations where we're not on a > detached HEAD. > > Signed-off-by: W. Trevor King <wk...@tremily.us> > ---
This should be a part of some other change that actually changes how this "git submodule update" checks out the submodule, no? > 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 > ) && -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
