From: Stefan Beller Date: Mon, 28 Mar 2016 23:28:20 GMT Subject: [PATCH 4/7] submodule update --init: correct path handling in recursive submodules Message-ID: <1459207703-1635-5-git-send-email-sbeller@google.com> In-Reply-To: <1459207703-1635-1-git-send-email-sbeller@google.com> This fixes the test introduced by the parent commit. Signed-off-by: Stefan Beller --- git-submodule.sh | 5 +++-- t/t7406-submodule-update.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 2838069..a7c8599 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -474,7 +474,7 @@ cmd_init() die_if_unmatched "$mode" name=$(git submodule--helper name "$sm_path") || exit - displaypath=$(relative_path "$sm_path") + displaypath=$(relative_path "$prefix$sm_path") # Copy url setting when it is not set yet if test -z "$(git config "submodule.$name.url")" @@ -826,8 +826,9 @@ Maybe you want to use 'update --init'?")" if test -n "$recursive" then ( - prefix="$prefix$sm_path/" + prefix="$(relative_path $prefix$sm_path)/" clear_local_git_env + wt_prefix= cd "$sm_path" && eval cmd_update ) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index c1b9ffa..3bd1552 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -118,7 +118,7 @@ Submodule path '../super/rebasing': checked out '${rebasingsha1}' Submodule path '../super/submodule': checked out '${submodulesha1}' EOF -test_expect_failure 'submodule update --init --recursive from subdirectory' ' +test_expect_success 'submodule update --init --recursive from subdirectory' ' git -C recursivesuper/super reset --hard HEAD^ && (cd recursivesuper && mkdir tmp && -- 2.8.0.rc4.23.gd22361a.dirty