From 13bc98d7ef7d1043df245973b963765909253319 Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Wed, 15 Oct 2025 06:06:05 -0700
Subject: [PATCH] Further enhancments to load-branch. Better output and branch
 choices.

---
 tasks/general/acct_mgmt/users.yml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/tasks/general/acct_mgmt/users.yml b/tasks/general/acct_mgmt/users.yml
index ef1193a..abd53f1 100644
--- a/tasks/general/acct_mgmt/users.yml
+++ b/tasks/general/acct_mgmt/users.yml
@@ -896,19 +896,33 @@
       function load-branch {
         rcvr="$1" # branch which we want to modify
         base="$2" # branch with the changes we want
-        if [[ "$rcvr" == main ]]; then
-          echo "Are you nuts, fool!? Not main! Do it manually!"
+        if [[ "$rcvr" == "main" ]]; then
+          echo "*** ERROR: Are you nuts, fool!? Not main! Do it manually! ***"
           exit 1
         fi
         if [[ -z "$base" ]]; then
-          base="dev"
+          if [[ "$rcvr" == "prod" ]]; then
+            base="stage"
+          elif [[ "$rcvr" == "stage" ]]; then
+            base="dev"
+          else
+            echo "* Unsure which branch to use for '$rcvr'. Please specify."
+            exit 1
+          fi
+          echo "* Base not specified, using '$base' for '$rcvr'."
         fi
+        echo "* Ensuring we are on base branch '$base'."
         git switch "$base"
+        echo "* Changing pointer for '$rcvr' to '$base'."
         git branch -f "$rcvr" "$base"
+        #echo "* Switching to branch '$rcvr'."
         #git switch "$rcvr"
+        echo "* Forcing push on branch '$rcvr'."
         git push --force --set-upstream origin "$rcvr"
+        #echo "* Switching back to '$base'."
         #git switch "$base"
-        git branch
+        echo "* Done! Displaying list of remote branches."
+        git ls-remote --heads | sort
       }
       alias load-prod="load-branch prod"
       alias load-stage="load-branch stage"