me/env-ansible
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-do changes lost between branch pointing.

Browse Source
This commit is contained in:
Hyperling
2025-10-15 06:28:38 -07:00
parent 40ee72b587
commit 2ca308c287
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tasks/general/acct_mgmt/users.yml
View File

@@ -909,20 +909,25 @@
echo "* Unsure which branch to use for '$rcvr'. Please specify." echo "* Unsure which branch to use for '$rcvr'. Please specify."
exit 1 exit 1
fi fi
echo "* Base not specified, using '$base' for '$rcvr'." echo "* Base was not specified, using '$base' for '$rcvr'."
else
echo "* Requested pointing '$rcvr' branch to '$base'."
fi fi
echo "* Ensuring we are on base branch '$base'." && echo -e "\n* Ensuring we are on base branch '$base'." &&
git switch "$base" && git switch "$base" &&
echo "* Changing pointer for '$rcvr' to '$base'." && echo -e "\n* Changing pointer for '$rcvr' to '$base'." &&
git branch -f "$rcvr" "$base" && git branch -f "$rcvr" "$base" &&
#echo "* Switching to branch '$rcvr'." && #echo -e "\n* Switching to branch '$rcvr'." &&
#git switch "$rcvr" && #git switch "$rcvr" &&
echo "* Forcing push on branch '$rcvr'." && echo -e "\n* Forcing push on branch '$rcvr'." &&
git push --force --set-upstream origin "$rcvr" && git push --force --set-upstream origin "$rcvr" &&
#echo "* Switching back to '$base'." && echo -e "\n* Done! Displaying list of remote branches." &&
#git switch "$base" &&
echo "* Done! Displaying list of remote branches." &&
git ls-remote --heads | sort git ls-remote --heads | sort
if [[ "$base" != "dev" ]]; then
echo -e "\n* Switching back to dev."
git switch "$base"
fi
} }
alias load-prod="load-branch prod" alias load-prod="load-branch prod"
alias load-stage="load-branch stage" alias load-stage="load-branch stage"