From: Wayne Davison <wayne@opencoder.net>
Date: Mon, 3 Aug 2020 17:23:43 +0000 (-0700)
Subject: A couple more mkgitver tweaks
X-Git-Tag: v3.2.3~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16b7670614daad3293047ac0568621e4a2f493f9;p=thirdparty%2Frsync.git

A couple more mkgitver tweaks

- Support git worktree checkouts (has non-dir .git)
- Use --always for someone who may be missing a tag.
---

diff --git a/mkgitver b/mkgitver
index 113cb64a..309beda7 100755
--- a/mkgitver
+++ b/mkgitver
@@ -2,8 +2,8 @@
 
 srcdir=`dirname $0`
 
-if test -d "$srcdir/.git"; then
-    gitver=\"`git describe --abbrev=8`\" || exit 1
+if test -e "$srcdir/.git"; then
+    gitver=\"`git describe --abbrev=8 --always`\" || exit 1
 else
     gitver=RSYNC_VERSION
 fi