From: Tay Ray Chuan <rctay89@gmail.com>
Date: Fri, 21 Oct 2011 13:49:36 +0000 (+0800)
Subject: submodule::module_clone(): silence die() message from module_name()
X-Git-Tag: v1.7.8-rc0~9^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9e76d4a8345b247395b902307407ba4eac737524;p=git.git

submodule::module_clone(): silence die() message from module_name()

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.

Analysis of other callsites is left to future work.

Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-submodule.sh b/git-submodule.sh
index 8e9e5eaaf..5d29f8214 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -124,7 +124,7 @@ module_clone()
 	reference="$3"
 	gitdir=
 	gitdir_base=
-	name=$(module_name "$path")
+	name=$(module_name "$path" 2>/dev/null)
 	base_path=$(dirname "$path")
 
 	gitdir=$(git rev-parse --git-dir)