Make git-desc work even outside git repositories and include it in tarballs

2 files changed, 10 insertions, 8 deletions

diff --git a/Makefile.in b/Makefile.in
index 48d95bb..95c896e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,7 +67,7 @@ DIRT +=		$(shell $(FIND) . -name '.\#*')
 
 SRC +=		COPYING AUTHORS TODO Makefile.in configure.ac		\
 		config/install-sh quilt.spec.in quilt.changes		\
-		bash_completion quilt.quiltrc aclocal.m4
+		bash_completion quilt.quiltrc aclocal.m4 git-desc
 DIRT +=		quilt.spec
 
 BIN_IN :=	quilt guards
diff --git a/git-desc b/git-desc
index b5dd0c5..67d9aa1 100755
--- a/git-desc
+++ b/git-desc
@@ -1,9 +1,11 @@
 #! /bin/sh
 
-tag=$(git describe --tags HEAD 2> /dev/null || \
-      git rev-parse --short HEAD)
-dirty=$(git update-index --refresh --unmerged > /dev/null
-	if git diff-index --name-only HEAD | read dummy; then
-	    echo -dirty
-	fi)
-echo $tag$dirty
+if git rev-parse --show-cdup > /dev/null 2> /dev/null; then
+	tag=$(git describe --tags HEAD 2> /dev/null || \
+	      git rev-parse --short HEAD)
+	dirty=$(git update-index --refresh --unmerged > /dev/null
+		if git diff-index --name-only HEAD | read dummy; then
+		    echo -dirty
+		fi)
+	echo $tag$dirty
+fi