Use a more reobust pkgver

2 files changed, 7 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28d0ca2a7293..63a04da2d949 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = git-identity-git
 	pkgdesc = Manage your identity in Git
 	pkgver = latest
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/madx/git-identity
 	arch = any
 	license = custom:WTFPL
diff --git a/PKGBUILD b/PKGBUILD
index a2c25ddef569..e7945b1dec0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=git-identity
 pkgname=$_pkgname-git
 pkgver=latest
-pkgrel=3
+pkgrel=4
 pkgdesc="Manage your identity in Git"
 arch=('any')
 url="https://github.com/madx/git-identity"
@@ -17,8 +17,11 @@ source=("$pkgname::git+https://github.com/madx/git-identity.git#branch=master")
 md5sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/"
-  git describe --always
+  cd "$pkgname"
+  ( set -o pipefail
+    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 package() {