Reroute the output of stdout to stderr as it is just informative messages, not to be consumed by machines.
This should not regress any scripts that try to parse the current output, as the output is already internationalized and therefore unstable. Signed-off-by: Stefan Beller <[email protected]> --- git-submodule.sh | 2 +- t/t7406-submodule-update.sh | 23 ++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 80270db..c86c2e5 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -679,7 +679,7 @@ cmd_update() 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 5f27879..1f8faa8 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -106,15 +106,8 @@ rebasingsha1=$(git -C super/rebasing rev-parse HEAD) submodulesha1=$(git -C super/submodule rev-parse HEAD) pwd=$(pwd) -cat <<EOF >expect -Submodule path '../super': checked out '$supersha1' -Submodule path '../super/merging': checked out '$mergingsha1' -Submodule path '../super/none': checked out '$nonesha1' -Submodule path '../super/rebasing': checked out '$rebasingsha1' -Submodule path '../super/submodule': checked out '$submodulesha1' -EOF - cat <<EOF >expect2 +Submodule path '../super': checked out '$supersha1' Submodule 'merging' ($pwd/merging) registered for path '../super/merging' Submodule 'none' ($pwd/none) registered for path '../super/none' Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing' @@ -127,6 +120,10 @@ Cloning into '$pwd/recursivesuper/super/rebasing'... done. Cloning into '$pwd/recursivesuper/super/submodule'... done. +Submodule path '../super/merging': checked out '$mergingsha1' +Submodule path '../super/none': checked out '$nonesha1' +Submodule path '../super/rebasing': checked out '$rebasingsha1' +Submodule path '../super/submodule': checked out '$submodulesha1' EOF test_expect_success 'submodule update --init --recursive from subdirectory' ' @@ -136,7 +133,7 @@ test_expect_success 'submodule update --init --recursive from subdirectory' ' cd tmp && git submodule update --init --recursive ../super >../../actual 2>../../actual2 ) && - test_cmp expect actual && + test_must_be_empty actual && test_cmp expect2 actual2 ' @@ -156,8 +153,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_must_be_empty actual && + test_i18ncmp expected actual.err ' test_expect_success 'submodule update should fail due to local changes' ' @@ -790,7 +787,7 @@ 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 && + git submodule update --init --recursive 2>actual && test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual && (cd submodule/subsubmodule && git log > ../../expected @@ -858,7 +855,7 @@ 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 && + git submodule update --recursive deeper/submodule 2>actual && test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual ) ' -- 2.8.0.32.g71f8beb.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
