From 0b425b9bbab8af90fc7dc1a25a23cafbcbd78f56 Mon Sep 17 00:00:00 2001 From: Eshan Roy Date: Sat, 30 Nov 2024 10:42:15 +0530 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20chore(=5Fbump):=20script=20=3D>?= =?UTF-8?q?=202.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- push.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/push.sh b/push.sh index 2208e801..74ba4310 100755 --- a/push.sh +++ b/push.sh @@ -17,6 +17,13 @@ error_exit() { # Ensure the script is run in a Git repository git rev-parse --is-inside-work-tree > /dev/null 2>&1 || error_exit "This is not a Git repository." +# Get the current branch name +branch=$(git rev-parse --abbrev-ref HEAD) + +# Pull the latest changes from the remote repository +echo "Pulling latest changes from remote branch '$branch'..." +git pull origin "$branch" || error_exit "Failed to pull changes from the remote repository. Please resolve any conflicts manually." + # Prompt the user to select a commit type echo "Select a commit type:" select type in "${TYPES[@]}"; do @@ -80,9 +87,9 @@ else fi # Push the changes to the remote repository -branch=$(git rev-parse --abbrev-ref HEAD) +echo "Pushing changes to remote branch '$branch'..." if git push origin "$branch"; then echo -e "\033[1;32mChanges pushed to remote branch '$branch'.\033[0m" else error_exit "Push failed. Please check your connection or branch permissions." -fi \ No newline at end of file +fi