diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-26 12:44:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-26 12:44:27 -0700 |
| commit | 50734ea0af6b92b82ade0be23db382ab87f9294a (patch) | |
| tree | 94dc502f0f097079713a7f313c6ce7acb21a6997 /t | |
| parent | ece12fd84480fc2bf9d43fc8c6be3aed4ada8ccc (diff) | |
| parent | 75bf5e60e8c09075af1e4cd0d68a6d73fdf92c42 (diff) | |
| download | git-50734ea0af6b92b82ade0be23db382ab87f9294a.tar.gz | |
Merge branch 'we/submodule-update-prefix-output' into maint
"git submodule update", when recursed into sub-submodules, did not
acccumulate the prefix paths.
* we/submodule-update-prefix-output:
submodule update: when using recursion, show full path
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7406-submodule-update.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 4975ec07ce..1a3d20bdc3 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -643,7 +643,8 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re rm -rf super_update_r2 && git clone super_update_r super_update_r2 && (cd super_update_r2 && - git submodule update --init --recursive && + git submodule update --init --recursive >actual && + test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual && (cd submodule/subsubmodule && git log > ../../expected ) && |