You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

92 lines
2.6 KiB
Bash

7 years ago
#!/usr/bin/env bash
# shellcheck disable=SC2230
7 years ago
# vim:ts=4:sts=4:sw=4:et
#
# Author: Hari Sekhon
# Date: 2017-11-21 10:45:41 +0100 (Tue, 21 Nov 2017)
#
# https://github.com/harisekhon/bash-tools
#
# License: see accompanying Hari Sekhon LICENSE file
#
# If you're using my code you're welcome to connect with me on LinkedIn and optionally send me feedback to help steer this or other code I publish
#
# https://www.linkedin.com/in/harisekhon
#
7 years ago
# Export of useful Git utility functions from years gone by
5 years ago
#
# far more git functions are available in the interactive library .bash.d/git.sh
7 years ago
7 years ago
set -euo pipefail
[ -n "${DEBUG:-}" ] && set -x
5 years ago
srcdir_git="${srcdir:-}"
7 years ago
srcdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
5 years ago
# shellcheck disable=SC1090
7 years ago
. "$srcdir/utils.sh"
allbranches(){
if type -P uniq_order_preserved.pl &>/dev/null; then
7 years ago
local uniq=uniq_order_preserved.pl
else
local uniq="sort | uniq"
fi
7 years ago
# this only shows local branches, to show all remote ones do
# git ls-remote | awk '/\/heads\//{print $2}' | sed 's,refs/heads/,,'
5 years ago
# shellcheck disable=SC2086
7 years ago
git branch -a | clean_branch_name | eval $uniq
7 years ago
}
clean_branch_name(){
sed '
s/^\* // ;
s/.*\/// ;
s/^[[:space:]]*// ;
s/[[:space:]]*$// ;
s/.*[[:space:]]// ;
s/)[[:space:]]*//
'
}
foreachbranch(){
5 years ago
local start_branch
start_branch=$(git branch | grep '^\*' | clean_branch_name);
local branches
branches="$(allbranches)";
7 years ago
if [ "$start_branch" != "master" ]; then
branches="$(sed "1,/$start_branch/d" <<< "$branches")";
fi;
local branch;
for branch in $branches; do
hr
5 years ago
if [ -z "${FORCEMASTER:-}" ] && [ "$branch" = "master" ]; then
7 years ago
echo "skipping master branch for safety (set FORCEMASTER=1 environment variable to override)"
continue
fi
if [ -n "${BRANCH_FILTER:-}" ] && ! grep -E "$BRANCH_FILTER" <<< "$branch"; then
6 years ago
continue
fi
7 years ago
echo "$branch:"
5 years ago
if git branch | grep -Fq --color=auto "$branch"; then
7 years ago
git checkout "$branch"
else
git checkout --track "origin/$branch";
5 years ago
fi &&
eval "$@" || return
7 years ago
echo
done
git checkout "$start_branch"
}
7 years ago
mybranch(){
git branch | awk '/^\*/ {print $2; exit}'
}
# shouldn't need to use this any more, git_check_branches_upstream.py from DevOps Python Tools repo has a --fix flag which will do this for all branches if they have no upstream set - https://github.com/harisekhon/devops-python-tools
7 years ago
set_upstream(){
5 years ago
git branch --set-upstream-to "origin/$(mybranch)" "$(mybranch)"
7 years ago
}
5 years ago
srcdir="$srcdir_git"