From c4019f81b741e8429fa02ed0c145f620048853d9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 25 Mar 2024 12:50:47 +0100
Subject: [PATCH] unstableGitUpdater: Move copy-pasted git describe call into
 reusable function

---
 pkgs/common-updater/unstable-updater.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix
index 1a417ebad3f5..d982fc6110ba 100644
--- a/pkgs/common-updater/unstable-updater.nix
+++ b/pkgs/common-updater/unstable-updater.nix
@@ -95,6 +95,9 @@ let
       fi
 
       git clone "''${cloneArgs[@]}" "$url" "$tmpdir"
+      getLatestVersion() {
+          git describe --tags --abbrev=0 --match "''${tag_format}" 2> /dev/null || true
+      }
 
       pushd "$tmpdir"
       commit_date="$(git show -s --pretty='format:%cs')"
@@ -104,7 +107,7 @@ let
           if [[ "$shallow_clone" == "1" ]]; then
               depth=100
               while (( depth < 10000 )); do
-                  last_tag="$(git describe --tags --abbrev=0 --match "''${tag_format}" 2> /dev/null || true)"
+                  last_tag="$(getLatestVersion)"
                   if [[ -n "$last_tag" ]]; then
                       break
                   fi
@@ -115,10 +118,10 @@ let
               if [[ -z "$last_tag" ]]; then
                   # To be extra sure, check if full history helps with finding a tag
                   git fetch --tags
-                  last_tag="$(git describe --tags --abbrev=0 --match "''${tag_format}" 2> /dev/null || true)"
+                  last_tag="$(getLatestVersion)"
               fi
           else
-              last_tag="$(git describe --tags --abbrev=0 --match "''${tag_format}" 2> /dev/null || true)"
+              last_tag="$(getLatestVersion)"
           fi
           if [[ -z "$last_tag" ]]; then
               last_tag="0"