diff --git a/push.sh b/push.sh index 2208e80..cf80693 100755 --- a/push.sh +++ b/push.sh @@ -3,12 +3,10 @@ # Author : ESHAN ROY # Author URI : https://eshanized.github.io -# NOTE : Run at your own risk! - # Define the conventional commit types with new emojis TYPES=("๐Ÿš€ feat" "๐Ÿ› fix" "๐Ÿ“ docs" "โœจ style" "๐Ÿ›  refactor" "โšก๏ธ perf" "๐Ÿ”ฌ test" "๐Ÿ”ง build" "๐Ÿค– ci" "๐Ÿงน chore" "โช revert") -# Function to display an error and exit +# Function to display an error and exit and error_exit() { echo -e "\033[1;31m[ERROR]\033[0m $1" exit 1 @@ -17,6 +15,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 @@ -32,13 +37,6 @@ type_emoji=${type} type=${type_emoji#* } emoji=${type_emoji% *} -# Prompt the user to enter a scope (optional) -read -p "Enter a scope (optional): " scope -scope_part="" -if [ -n "$scope" ]; then - scope_part="($scope)" -fi - # Prompt the user to enter a short description read -p "Enter a short description: " desc if [ -z "$desc" ]; then @@ -49,26 +47,17 @@ fi read -p "Enter a longer description (optional): " long_desc # Create the commit message -commit_msg="$emoji $type$scope_part: $desc" +commit_msg="$emoji $type: $desc" # If a longer description was provided, add it to the commit message if [ -n "$long_desc" ]; then - commit_msg+=" - -$long_desc" + commit_msg+="\n\n$long_desc" fi # Print the commit message to the console echo -e "\nCommit message:" echo -e "\033[1;36m$commit_msg\033[0m" -# Confirm before committing -read -p "Do you want to proceed with this commit? (y/n): " confirm -if [[ "$confirm" != "y" && "$confirm" != "Y" ]]; then - echo "Commit aborted." - exit 0 -fi - # Stage all changes git add . @@ -80,7 +69,7 @@ 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