Bash script for applying CE workflow

commit.sh

#!/bin/bash

# Determine the current branch
branch_name="$(git symbolic-ref HEAD 2>/dev/null)" ||
branch_name="(unnamed branch)"     # detached HEAD
branch_name=${branch_name##refs/heads/}
echo "Working on branch $branch_name."

# Get remote info
remote_check=`git remote -v show`

# Determine if this is GitHub or GitLab
if [[ $remote_check == *"github"* ]]; then
  echo "GitHub repo, will name branches with PR."
  merge_indicator="PR"
else
  echo "Not a GitHub repo, assuming GitLab, will name branches with MR."
  merge_indicator="MR"
fi

# Determine if we're on a feature branch
if [[ $branch_name == *"$merge_indicator"* ]]; then
  echo "Looks like you're trying to run this script from your merge branch!"
  echo "You need to run it from your feature branch. Exiting."
  exit 1
fi

# Fetch branches
git_branches=`git branch`

# Determine naming convention applied
if [[ $git_branches == *"1.x"* ]]; then
  echo "Using devel/1.x naming convention."
  main_branch="1.x"
  test_branch="devel"
else
  echo "Using apply/test naming convention."
  main_branch="apply"
  test_branch="test"
fi

echo "NOW EXECUTING GIT COMMANDS!"
echo "---------------------------"

echo "Making sure main and test branches are up to date."
# Checkout and pull main and test branches
git checkout $test_branch
git pull origin $test_branch
git checkout $main_branch
git pull origin $main_branch
echo "---------------------------"

echo "Preparing test branch for merge request."
# Determine if merge branch exists for test
if [[ `git branch --list $branch_name-$merge_indicator-$test_branch` ]]; then
   echo "Branch name with $branch_name-$merge_indicator-$test_branch already exists."
   git_checkout_flag_test=""
else
   echo "No branch with name $branch_name-$merge_indicator-$test_branch, creating."
   git_checkout_flag_test=" -b"
fi
# Checkout test merge branch
git checkout$git_checkout_flag_test $branch_name-$merge_indicator-$test_branch
git merge $test_branch
git merge $branch_name
git push origin $branch_name-$merge_indicator-$test_branch
echo "---------------------------"

if [[ $1 == "apply" ]]; then
  echo "Also merging main branch."
  echo "Returning to our feature branch."
  git checkout $branch_name
  # Determine if merge branch exists for main
  if [[ `git branch --list $branch_name-$merge_indicator-$main_branch` ]]; then
    echo "Branch name with $branch_name-$merge_indicator-$main_branch already exists."
    git_checkout_flag_main=""
  else
    echo "No branch with name $branch_name-$merge_indicator-$main_branch, creating."
    git_checkout_flag_main=" -b"
  fi
  # Checkout main merge branch
  git checkout$git_checkout_flag_main $branch_name-$merge_indicator-$main_branch
  git merge $main_branch
  git merge $branch_name
  git push origin $branch_name-$merge_indicator-$main_branch
  echo "---------------------------"
fi

echo "Returning to our feature branch."
git checkout $branch_name
echo "---------------------------"
echo "ALL DONE!"