diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2009-06-17 13:15:17 +0200 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2009-06-17 13:15:17 +0200 |
commit | fa1c4d3b976df7b619219205af9563ecf29424d2 (patch) | |
tree | efee6c5bc6ce9c537d7336654e20986a5633452c | |
parent | 5aadacd123994ab868a80ded26568616f77ca43c (diff) | |
download | quilt-fa1c4d3b976df7b619219205af9563ecf29424d2.tar.gz |
Make git-desc work even outside git repositories and include it in tarballs
-rw-r--r-- | Makefile.in | 2 | ||||
-rwxr-xr-x | git-desc | 16 |
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 @@ -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 |