Allow getOpenJDKTag() to default to version of checked out BRANCH if no tags in repo (#4265)

* Allow getOpenJDKTag() to default to version of checked out BRANCH if no tags in repo

Signed-off-by: Andrew Leonard <[email protected]>

* Allow getOpenJDKTag() to default to version of checked out BRANCH if no tags in repo

Signed-off-by: Andrew Leonard <[email protected]>

* Allow getOpenJDKTag() to default to version of checked out BRANCH if no tags in repo

Signed-off-by: Andrew Leonard <[email protected]>

* Allow getOpenJDKTag() to default to version of checked out BRANCH if no tags in repo

Signed-off-by: Andrew Leonard <[email protected]>

---------

Signed-off-by: Andrew Leonard <[email protected]>

Author: andrew-m-leonard

sbin/build.sh

@@ -2053,23 +2053,27 @@ getLatestTagJDK11plus() {
 
 createDefaultTag() {
   if [ "${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}" == "8" ]; then
-    echo "WARNING: Could not identify latest tag but the ADOPT_BRANCH_SAFETY flag is off so defaulting to 8u000-b00" 1>&2
+    echo "WARNING: Could not identify latest tag, defaulting to 8u000-b00" 1>&2
     echo "8u000-b00"
   else
-    echo "WARNING: Could not identify the latest tag, but the ADOPT_BRANCH_SAFETY flag is off, so defaulting to jdk-${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}.0.0+0" 1>&2
+    echo "WARNING: Could not identify the latest tag, defaulting to jdk-${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}.0.0+0" 1>&2
     echo "jdk-${BUILD_CONFIG[OPENJDK_FEATURE_NUMBER]}.0.0+0"
   fi
 }
 
-# Get the build "tag" being built, either specified via TAG or BRANCH, otherwise get latest from the git repo
+# Get the build "tag" being built, either specified via TAG or BRANCH, otherwise get latest from the git repo, or default to BRANCH name if set
 getOpenJDKTag() {
+  echo "getOpenJDKTag(): Determining OpenJDK tag to use for 'version'" 1>&2
   if [ -n "${BUILD_CONFIG[TAG]}" ]; then
     # Checked out TAG specified
+    echo "  getOpenJDKTag(): Using specified BUILD_CONFIG[TAG] (${BUILD_CONFIG[TAG]})" 1>&2
     echo "${BUILD_CONFIG[TAG]}"
   elif cd "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}" && git show-ref -q --verify "refs/tags/${BUILD_CONFIG[BRANCH]}"; then
     # Checked out BRANCH is a tag
+    echo "  getOpenJDKTag(): Using tag specified by BUILD_CONFIG[BRANCH] (${BUILD_CONFIG[BRANCH]})" 1>&2
     echo "${BUILD_CONFIG[BRANCH]}"
   else
+    echo "  getOpenJDKTag(): Determining tag from checked out repository.." 1>&2
     getFirstTagFromOpenJDKGitRepo
   fi
 }
@@ -2122,14 +2126,8 @@ getFirstTagFromOpenJDKGitRepo() {
 
   if [ -z "$firstMatchingNameFromRepo" ]; then
     echo "WARNING: Failed to identify latest tag in the repository" 1>&2
-    # If the ADOPT_BRANCH_SAFETY flag is set, we may be building from an alternate
-    # repository that doesn't have the same tags, so allow defaults. For a better
-    # options see https://github.com/adoptium/temurin-build/issues/2671
-    if [ "${BUILD_CONFIG[DISABLE_ADOPT_BRANCH_SAFETY]}" == "true" ]; then
-      createDefaultTag
-    else
-      echo "WARNING: Failed to identify latest tag in the repository" 1>&2
-    fi
+    # We may be building from an alternate non-adoptium repository, or from a personal branch with no tags, so use a default tag name
+    createDefaultTag
   else
     echo "$firstMatchingNameFromRepo"
   fi

sbin/prepareWorkspace.sh

@@ -225,12 +225,12 @@ checkoutRequiredCodeToBuild() {
     git fetch --tags || rc=$?
     if [ $rc -eq 0 ]; then
       if git show-ref -q --verify "refs/tags/${BUILD_CONFIG[BRANCH]}"; then
-        echo "looks like the scm ref given is a valid tag, so treat it as a tag"
+        echo "looks like the BUILD_CONFIG[BRANCH] (${BUILD_CONFIG[BRANCH]}) scm ref given is a valid tag, so treat it as a tag"
         tag="${BUILD_CONFIG[BRANCH]}"
         BUILD_CONFIG[TAG]="${tag}"
         BUILD_CONFIG[SHALLOW_CLONE_OPTION]=""
-      elif git cat-file commit "${BUILD_CONFIG[BRANCH]}"; then
-        echo "look like the scm ref given is a valid sha, so treat it as a sha"
+      elif git cat-file commit "${BUILD_CONFIG[BRANCH]}" 2>/dev/null; then
+        echo "looks like the BUILD_CONFIG[BRANCH] (${BUILD_CONFIG[BRANCH]}) scm ref given is a valid sha, so treat it as a sha"
         sha="${BUILD_CONFIG[BRANCH]}"
         BUILD_CONFIG[SHALLOW_CLONE_OPTION]=""
       fi
@@ -274,6 +274,7 @@ checkoutRequiredCodeToBuild() {
     else
       git remote set-branches --add origin "${BUILD_CONFIG[BRANCH]}" || rc=$?
       if [ $rc -eq 0 ]; then
+        echo "BUILD_CONFIG[BRANCH] (${BUILD_CONFIG[BRANCH]}) is a valid branch, fetching and resetting to branch"
         # shellcheck disable=SC2086
         git fetch --all ${BUILD_CONFIG[SHALLOW_CLONE_OPTION]} || rc=$?
         if [ $rc -eq 0 ]; then