From 153314eeb8cb94ab40c92bd5e3306fd6e60dab2f Mon Sep 17 00:00:00 2001
From: Nathaniel Young <nathanielyoung95070@gmail.com>
Date: Tue, 9 Aug 2022 17:42:17 -0700
Subject: [PATCH 1/3] fixes tag if there are no existing tags

---
 Dockerfile    |  4 ++--
 entrypoint.sh | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 715d4012..6e5e2dc6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ LABEL "repository"="https://github.com/anothrNick/github-tag-action"
 LABEL "homepage"="https://github.com/anothrNick/github-tag-action"
 LABEL "maintainer"="Nick Sjostrom"
 
-COPY entrypoint.sh /entrypoint.sh
-
 RUN apk update && apk add bash git curl jq && npm install -g semver
 
+COPY entrypoint.sh /entrypoint.sh
+
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/entrypoint.sh b/entrypoint.sh
index 81f80650..d11274ee 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -50,18 +50,26 @@ git fetch --tags
 tagFmt="^v?[0-9]+\.[0-9]+\.[0-9]+$" 
 preTagFmt="^v?[0-9]+\.[0-9]+\.[0-9]+(-$suffix\.[0-9]+)?$" 
 
+tag=""
+
 # get latest tag that looks like a semver (with or without v)
 case "$tag_context" in
     *repo*) 
         taglist="$(git for-each-ref --sort=-v:refname --format '%(refname:lstrip=2)' | grep -E "$tagFmt")"
-        tag="$(semver $taglist | tail -n 1)"
+        if [ ! -z "$taglist" ]
+        then
+            tag="$(semver $taglist | tail -n 1)"
+        fi
 
         pre_taglist="$(git for-each-ref --sort=-v:refname --format '%(refname:lstrip=2)' | grep -E "$preTagFmt")"
         pre_tag="$(semver "$pre_taglist" | tail -n 1)"
         ;;
     *branch*) 
         taglist="$(git tag --list --merged HEAD --sort=-v:refname | grep -E "$tagFmt")"
-        tag="$(semver $taglist | tail -n 1)"
+        if [ ! -z "$taglist" ]
+        then
+            tag="$(semver $taglist | tail -n 1)"
+        fi
 
         pre_taglist="$(git tag --list --merged HEAD --sort=-v:refname | grep -E "$preTagFmt")"
         pre_tag=$(semver "$pre_taglist" | tail -n 1)

From 989c3fcc8cf5279f02b634fc72c35a71babd8ee6 Mon Sep 17 00:00:00 2001
From: Nathaniel Young <nathanielyoung95070@gmail.com>
Date: Fri, 9 Sep 2022 23:01:25 -0700
Subject: [PATCH 2/3] actually fixes merge conflicts

---
 entrypoint.sh | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 06f0f3d4..6ef56ed4 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -55,33 +55,12 @@ tag=""
 # get latest tag that looks like a semver (with or without v)
 case "$tag_context" in
     *repo*) 
-<<<<<<< HEAD
-        taglist="$(git for-each-ref --sort=-v:refname --format '%(refname:lstrip=2)' | grep -E "$tagFmt")"
-        if [ ! -z "$taglist" ]
-        then
-            tag="$(semver $taglist | tail -n 1)"
-        fi
-
-        pre_taglist="$(git for-each-ref --sort=-v:refname --format '%(refname:lstrip=2)' | grep -E "$preTagFmt")"
-        pre_tag="$(semver "$pre_taglist" | tail -n 1)"
-        ;;
-    *branch*) 
-        taglist="$(git tag --list --merged HEAD --sort=-v:refname | grep -E "$tagFmt")"
-        if [ ! -z "$taglist" ]
-        then
-            tag="$(semver $taglist | tail -n 1)"
-        fi
-
-        pre_taglist="$(git tag --list --merged HEAD --sort=-v:refname | grep -E "$preTagFmt")"
-        pre_tag=$(semver "$pre_taglist" | tail -n 1)
-=======
         tag="$(git for-each-ref --sort=-v:refname --format '%(refname:lstrip=2)' | grep -E "$tagFmt" | head -n 1)"
         pre_tag="$(git for-each-ref --sort=-v:refname --format '%(refname:lstrip=2)' | grep -E "$preTagFmt" | head -n 1)"
         ;;
     *branch*) 
         tag="$(git tag --list --merged HEAD --sort=-v:refname | grep -E "$tagFmt" | head -n 1)"
         pre_tag="$(git tag --list --merged HEAD --sort=-v:refname | grep -E "$preTagFmt" | head -n 1)"
->>>>>>> 38e273cbdda80759cc0232a36f559999f4e47d29
         ;;
     * ) echo "Unrecognised context"
         exit 1;;

From 35070b6ee843e560ce5c9c357164bbe2c7f0e898 Mon Sep 17 00:00:00 2001
From: Nathaniel Young <nathanielyoung95070@gmail.com>
Date: Fri, 9 Sep 2022 23:01:41 -0700
Subject: [PATCH 3/3] removes tag

---
 entrypoint.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 6ef56ed4..3dfc9478 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -50,8 +50,6 @@ git fetch --tags
 tagFmt="^v?[0-9]+\.[0-9]+\.[0-9]+$"
 preTagFmt="^v?[0-9]+\.[0-9]+\.[0-9]+(-$suffix\.[0-9]+)$"
 
-tag=""
-
 # get latest tag that looks like a semver (with or without v)
 case "$tag_context" in
     *repo*)