Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> --- git-submodule.sh | 2 +- t/t7406-submodule-update.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 56a0524..bb8b2c7 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -780,7 +780,7 @@ Maybe you want to use 'update --init'?")" if (clear_local_git_env; cd "$sm_path" && $command "$sha1") then - say "$say_msg" + say >&2 "$say_msg" elif test -n "$must_die_on_failure" then die_with_status 2 "$die_msg" diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index dda3929..f65b81c 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -111,8 +111,8 @@ test_expect_success 'submodule update does not fetch already present commits' ' (cd super && git submodule update > ../actual 2> ../actual.err ) && - test_i18ncmp expected actual && - ! test -s actual.err + test_i18ncmp expected actual.err && + ! test -s actual ' test_expect_success 'submodule update should fail due to local changes' ' @@ -702,8 +702,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 >actual && - test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual && + git submodule update --init --recursive 2>actual.err && + test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual.err && (cd submodule/subsubmodule && git log > ../../expected ) && @@ -770,8 +770,8 @@ test_expect_success 'submodule update --recursive drops module name before recur (cd deeper/submodule/subsubmodule && git checkout HEAD^ ) && - git submodule update --recursive deeper/submodule >actual && - test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual + git submodule update --recursive deeper/submodule 2>actual.err && + test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual.err ) ' test_done -- 2.5.0.277.gfdc362b.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html