From 69356f6de04f9bae359d9a0ee00da42ed024d76a Mon Sep 17 00:00:00 2001
From: petru <petru@safesys.ro>
Date: Sun, 17 May 2026 15:37:25 +0000
Subject: [PATCH] Fixed - [scripts] [custom-release] [release-target] Stopped
 release-target sync from requiring the remote release branch when an explicit
 target tag/ref is configured. - 1 - I updated
 [`.maintain-custom-release.sh`](/config/workspace/gitea-dev/gitea/.maintain-custom-release.sh)
 so `Sync upstream release target commits` validates only the configured
 `UPSTREAM_RELEASE_TARGET_REF` when one is set, instead of still failing on a
 missing local `upstream/release/...` remote-tracking branch after
 successfully fetching a target tag such as `v1.26.1`.

(cherry picked from commit 244a47269110f29ddfe4782964345b4446ce4910)
(cherry picked from commit 63b691c29eff4d943d0b5024069062473d7a8865)
---
 .codex-history.md           | 3 +++
 .maintain-custom-release.sh | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/.codex-history.md b/.codex-history.md
index 2a9b3f19f8..a3b4f404b2 100644
--- a/.codex-history.md
+++ b/.codex-history.md
@@ -786,3 +786,6 @@ History search guidance:
 
 156 - [2026-05-17 18:14:08] - v1.26.0-by-petru-24-gadb90b3453 - Type: Modified - [scripts] [smart-build] [artifacts] Renamed smart-build outputs to include the tag/ref and generated per-file SHA-256 checksums.
 - 1 - I updated [`.smart-build.sh`](/config/workspace/gitea-dev/gitea/.smart-build.sh) so each build artifact is now written as `gitea-<tag-or-ref>-<os>-<platform><-sqlite>` with the original executable extension preserved, and each output also gets its own adjacent `.sha256` file generated with `sha256sum` or `shasum -a 256`.
+
+157 - [2026-05-17 15:35:49] - v1.26.0-by-petru - Type: Fixed - [scripts] [custom-release] [release-target] Stopped release-target sync from requiring the remote release branch when an explicit target tag/ref is configured.
+- 1 - I updated [`.maintain-custom-release.sh`](/config/workspace/gitea-dev/gitea/.maintain-custom-release.sh) so `Sync upstream release target commits` validates only the configured `UPSTREAM_RELEASE_TARGET_REF` when one is set, instead of still failing on a missing local `upstream/release/...` remote-tracking branch after successfully fetching a target tag such as `v1.26.1`.
diff --git a/.maintain-custom-release.sh b/.maintain-custom-release.sh
index fa80e0184f..142b3643f5 100755
--- a/.maintain-custom-release.sh
+++ b/.maintain-custom-release.sh
@@ -778,6 +778,12 @@ ensure_upstream_compare_ref_exists() {
 ensure_upstream_target_ref_exists() {
   local source_ref=""
 
+  if [ -n "$UPSTREAM_RELEASE_TARGET_REF" ]; then
+    source_ref="$(resolve_upstream_release_import_ref)"
+    git rev-parse --verify "$source_ref" >/dev/null 2>&1 || die "Upstream release target ref '$source_ref' was not found locally."
+    return
+  fi
+
   normalize_upstream_release_branch
   source_ref="$(resolve_upstream_release_import_ref)"
   git rev-parse --verify "$source_ref" >/dev/null 2>&1 || die "Upstream release target ref '$source_ref' was not found locally."