From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH 04/12] git submodule update: Announce outcome of submodule operation to stderr
Date: Thu, 15 Oct 2015 18:52:05 -0700 [thread overview]
Message-ID: <1444960333-16003-5-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1444960333-16003-1-git-send-email-sbeller@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
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
next prev parent reply other threads:[~2015-10-16 1:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-16 1:52 [RFC PATCHv1 00/12] git submodule update in C with parallel cloning Stefan Beller
2015-10-16 1:52 ` [PATCH 01/12] git submodule update: Announce skipping submodules on stderr Stefan Beller
2015-10-16 20:37 ` Junio C Hamano
2015-10-16 20:47 ` Stefan Beller
2015-10-16 1:52 ` [PATCH 02/12] git submodule update: Announce uninitialized modules " Stefan Beller
2015-10-16 20:54 ` Junio C Hamano
2015-10-16 1:52 ` [PATCH 03/12] git submodule update: Move branch calculation to where it's needed Stefan Beller
2015-10-16 20:54 ` Junio C Hamano
2015-10-16 1:52 ` Stefan Beller [this message]
2015-10-16 1:52 ` [PATCH 05/12] git submodule update: Use its own list implementation Stefan Beller
2015-10-16 21:02 ` Junio C Hamano
2015-10-16 21:08 ` Stefan Beller
2015-10-16 1:52 ` [PATCH 06/12] git submodule update: Handle unmerged submodules in C Stefan Beller
2015-10-20 21:11 ` Junio C Hamano
2015-10-20 21:21 ` Stefan Beller
2015-10-16 1:52 ` [PATCH 07/12] submodule config: keep update strategy around Stefan Beller
2015-10-16 1:52 ` [PATCH 08/12] git submodule update: check for "none" in C Stefan Beller
2015-10-16 1:52 ` [PATCH 09/12] git submodule update: Check url " Stefan Beller
2015-10-16 1:52 ` [PATCH 10/12] git submodule update: Clone projects from within C Stefan Beller
2015-10-16 1:52 ` [PATCH 11/12] submodule--helper: Do not emit submodules to process directly Stefan Beller
2015-10-16 1:52 ` [PATCH 12/12] WIP/broken Clone all outstanding submodules in parallel Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444960333-16003-5-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).