Modified - Extended the custom-release maintenance helper with manual restore points and corrected its fetch behavior.

2026-05-13 20:26:59 +00:00
parent 92c6dad4b9
commit 363c86ecaf
4 changed files with 385 additions and 44 deletions
@@ -429,7 +429,7 @@ stash_local_changes() {

 fetch_upstream() {
  say "Fetching latest changes from $REMOTE_NAME/$BRANCH..."
-  git fetch --prune "$REMOTE_NAME"
+  git fetch --prune "$REMOTE_NAME" "+refs/heads/$BRANCH:refs/remotes/$REMOTE_NAME/$BRANCH"
  git show-ref --verify --quiet "refs/remotes/$REMOTE_NAME/$BRANCH" || die "Remote branch '$REMOTE_NAME/$BRANCH' was not found."
 }

@@ -926,7 +926,7 @@ run_dry_run_sync() {
  prepare_dry_run_workspace "$dry_run_branch_dir" "$temp_repo"

  say "Testing upstream fetch in the dry-run clone..."
-  git -C "$temp_repo" fetch --prune "$REMOTE_NAME"
+  git -C "$temp_repo" fetch --prune "$REMOTE_NAME" "+refs/heads/$BRANCH:refs/remotes/$REMOTE_NAME/$BRANCH"
  git -C "$temp_repo" show-ref --verify --quiet "refs/remotes/$REMOTE_NAME/$BRANCH" || die "Remote branch '$REMOTE_NAME/$BRANCH' was not found during test."

  say "Testing rebase in the dry-run clone..."