From: Ping Yin <pkufranky@gmail.com>
Date: Thu, 10 Apr 2008 14:45:29 +0000 (+0800)
Subject: git-submodule: Avoid 'fatal: cannot describe' message
X-Git-Tag: v1.5.5.1~16
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a68972c2ad7c3de582abeed03f660e19950ed66f;p=git.git

git-submodule: Avoid 'fatal: cannot describe' message

When "git submodule status" command tries to show the name of the
submodule HEAD revision more descriptively, but the submodule
repository lacked a suitable tag to do so, it leaked "fatal: cannot
describe" message to the UI.  Squelch it by using '--always'.

Signed-off-by: Ping Yin <pkufranky@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-submodule.sh b/git-submodule.sh
index 56ec3536e..7674346c8 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -327,7 +327,7 @@ set_name_rev () {
 		cd "$1" && {
 			git describe "$2" 2>/dev/null ||
 			git describe --tags "$2" 2>/dev/null ||
-			git describe --contains --tags "$2"
+			git describe --contains --tags --always "$2"
 		}
 	) )
 	test -z "$revname" || revname=" ($revname)"