#!/bin/bash ################################## # User configuration (change me) # ################################## # The general setup that is suggested here is: # # GIT_PATH = /home//git/ # ... where the git repository directories resides. # TOR_MASTER_NAME = "tor" # ... which means that tor.git was cloned in /home//git/tor # TOR_WKT_NAME = "tor-wkt" # ... which means that the tor worktrees are in /home//git/tor-wkt # Where are all those git repositories? GIT_PATH="FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY" # The tor master git repository directory from which all the worktree have # been created. TOR_MASTER_NAME="tor" # The worktrees location (directory). TOR_WKT_NAME="tor-wkt" ######################### # End of configuration. # ######################### # Configuration of the branches that needs merging. The values are in order: # (1) Branch name to pull (update). # (2) Full path of the git worktree. # # As an example: # $ cd (3) # $ git checkout maint-0.3.5 (1) # $ git pull # # First set of arrays are the maint-* branch and then the release-* branch. # New arrays need to be in the WORKTREE= array else they aren't considered. MAINT_029=( "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.2.9" ) MAINT_034=( "maint-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.4" ) MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) MAINT_040=( "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" ) MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" ) RELEASE_029=( "release-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" ) RELEASE_034=( "release-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.4" ) RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) RELEASE_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) # The master branch path has to be the main repository thus contains the # origin that will be used to fetch the updates. All the worktrees are created # from that repository. ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME" # SC2034 -- shellcheck thinks that these are unused. We know better. ACTUALLY_THESE_ARE_USED=<&1 ) validate_ret $? "$msg" else printf "\\n %s\\n" "${IWTH}$cmd${CNRM}" fi } # Pull the given branch name. function merge_branch { local cmd="git merge --ff-only origin/$1" printf " %s Merging branch origin/%s..." "$MARKER" "$1" if [ $DRY_RUN -eq 0 ]; then msg=$( eval "$cmd" 2>&1 ) validate_ret $? "$msg" else printf "\\n %s\\n" "${IWTH}$cmd${CNRM}" fi } # Go into the worktree repository. function goto_repo { if [ ! -d "$1" ]; then echo " $1: Not found. Stopping." exit 1 fi cd "$1" || exit } # Fetch the origin. No arguments. function fetch_origin { local cmd="git fetch origin" printf " %s Fetching origin..." "$MARKER" if [ $DRY_RUN -eq 0 ]; then msg=$( eval "$cmd" 2>&1 ) validate_ret $? "$msg" else printf "\\n %s\\n" "${IWTH}$cmd${CNRM}" fi } ############### # Entry point # ############### while getopts "n" opt; do case "$opt" in n) DRY_RUN=1 echo " *** DRY DRUN MODE ***" ;; *) ;; esac done # First, fetch the origin. goto_repo "$ORIGIN_PATH" fetch_origin # Go over all configured worktree. for ((i=0; i