From 466e5b2f537dbe2c06e728095d4202b1a74f277b Mon Sep 17 00:00:00 2001
From: jief666 <github.com@jfa.knudsen.ovh>
Date: Tue, 17 Nov 2020 13:35:00 +0300
Subject: [PATCH] Revision is now ok when we are in a branch.

---
 CloverPackage/makeiso | 2 +-
 CloverPackage/makepkg | 2 +-
 buildme               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CloverPackage/makeiso b/CloverPackage/makeiso
index f6bf53652..b5d80e763 100755
--- a/CloverPackage/makeiso
+++ b/CloverPackage/makeiso
@@ -32,7 +32,7 @@ CDBOOT=${IMGROOT}/usr/standalone/i386/cdboot
 EFIROOT=${SRCROOT}/CloverV2/EFI
 BASETOOLS_DIR=${SRCROOT}/../BaseTools/Source/C/bin
 
-REVISION=$(git describe --tags $(git rev-list --tags --max-count=1))
+REVISION=$(git describe --tags)
 PRODUCT=Clover-${REVISION}
 CDLABEL=${PRODUCT}-X64
 ISOIMAGE=${SYMROOT}/${CDLABEL}.iso
diff --git a/CloverPackage/makepkg b/CloverPackage/makepkg
index 2be45e139..7052da75c 100755
--- a/CloverPackage/makepkg
+++ b/CloverPackage/makepkg
@@ -31,7 +31,7 @@ done
 # Go to the script directory to create the package
 cd "$(dirname $0)"
 
-revision=$(git describe --tags $(git rev-list --tags --max-count=1))
+revision=$(git describe --tags)
 
 SRCROOT="${PWD}"
 SYMROOT="${SRCROOT}"/sym
diff --git a/buildme b/buildme
index c75a7fdf3..278b604ca 100755
--- a/buildme
+++ b/buildme
@@ -262,7 +262,7 @@ if [[ -d .git ]]; then
   lsha1=$(git rev-parse --short HEAD)
 fi
 
-echo "buildme, Clover r$(git describe --tags $(git rev-list --tags --max-count=1)) (SHA: $lsha1)"
+echo "buildme, Clover r$(git describe --tags) (SHA: $lsha1)"
 echo "TOOLCHAIN: $MYTOOLCHAIN (override example: './buildme XCODE8')"
 echo
 PS3='Please enter your choice: '