Merged to main

Author: wesleyscholl

git-commit-push-script.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 source ~/.bash_profile
 
-# Add all changes
+# Stage all changes
 git add -A
 
 # Get branch name
@@ -10,8 +10,6 @@ base_branch=$(git rev-parse --abbrev-ref HEAD)
 # Extract ticket number from current directory
 ticket=$(echo $base_branch | grep -o -E '([A-Za-z]+-[0-9]{3,}|[A-Za-z]+-[0-9]{3,})')
 
-echo "Ticket: $ticket"
-
 # Get the git diff
 diff=$(git diff --cached)
 
@@ -22,27 +20,41 @@ diff=$(echo $diff | sed 's/\\/\\\\/g' | sed 's/"/\\"/g' | sed 's/\n/\\n/g')
 gemini_request='{"contents":[{"parts":[{"text": "Write a git commit message (72 character maximum) for the following git diff: '"$diff"' "}]}]}'
 
 # Get commit message from Gemini API
-commit_message=$(curl \
+commit_message=$(curl -s \
   -H 'Content-Type: application/json' \
   -d "$gemini_request" \
   -X POST "https://generativelanguage.googleapis.com/v1beta/models/gemini-1.5-flash-latest:generateContent?key=${GEMINI_API_KEY}" \
   |  jq -r '.candidates[0].content.parts[0].text'
 )
 
-echo "$commit_message"
-
 # Prepare and execute commit command
 git commit -S -m "$ticket $commit_message"
 
 # Check if the branch exists on the remote
 remote_branch=$(git ls-remote --heads origin $base_branch)
 
+# Function: pull_push_after_failed_push - If push fails, attempt to pull and push again
+pull_push_after_failed_push() {
+	echo "Push failed. Attempting to pull and push again."
+	git pull
+	git push
+}
+
+# Check if the branch exists on the remote
 if [ -z "$remote_branch" ]; then
 	echo "Branch '$base_branch' does not exist on remote. Creating it."
 	# Push the local branch to the remote, setting the upstream branch
 	git push --set-upstream origin $base_branch
+
+	if [ $? -ne 0 ]; then
+		pull_push_after_failed_push
+	fi
 else
 	echo "Branch '$base_branch' exists on remote. Pushing changes."
 	# Push changes to the remote
 	git push
+
+	if [ $? -ne 0 ]; then
+		pull_push_after_failed_push
+	fi
 fi