git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tay Ray Chuan <rctay89@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/2] submodule::module_clone(): silence die() message from module_name()
Date: Fri,  7 Oct 2011 17:04:55 +0800	[thread overview]
Message-ID: <1317978295-4796-2-git-send-email-rctay89@gmail.com> (raw)
In-Reply-To: <1317978295-4796-1-git-send-email-rctay89@gmail.com>

The die() message that may occur in module_name() is not really relevant
to the user when called from module_clone(); the latter handles the
"failure" (no submodule mapping) anyway.

Leave other callers of module_name() unchanged, as the die() message
shown is either relevant for user consumption (such as those that exit()
when the call fails), or will not occur at all (when called with paths
returned by module_list()).

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
---
 git-submodule.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-submodule.sh b/git-submodule.sh
index ebea35b..3adab93 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -130,7 +130,7 @@ module_clone()
 
 	gitdir=
 	gitdir_base=
-	name=$(module_name "$path")
+	name=$(module_name "$path" 2>/dev/null)
 	base_path=$(dirname "$path")
 
 	gitdir=$(git rev-parse --git-dir)
-- 
1.7.7.584.g16d0ea

  reply	other threads:[~2011-10-07  9:05 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-07  9:04 [PATCH 1/2] submodule: whitespace fix Tay Ray Chuan
2011-10-07  9:04 ` Tay Ray Chuan [this message]
2011-10-10 19:34   ` [PATCH 2/2] submodule::module_clone(): silence die() message from module_name() Jens Lehmann
2011-10-11  8:44     ` Tay Ray Chuan
2011-10-11 17:38       ` Jens Lehmann
2011-10-21 13:49   ` [PATCH v2 0/2] submodule patches Tay Ray Chuan
2011-10-21 13:49     ` [PATCH v2 1/2] submodule: whitespace fix Tay Ray Chuan
2011-10-21 13:49       ` [PATCH v2 2/2] submodule::module_clone(): silence die() message from module_name() Tay Ray Chuan
2011-10-10 18:52 ` [PATCH 1/2] submodule: whitespace fix Jens Lehmann

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1317978295-4796-2-git-send-email-rctay89@gmail.com \
    --to=rctay89@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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.
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 NNTP newsgroup(s).