Merge branch 'feature/compliance' into develop
This commit is contained in:
commit
d44eaf90e8
7 changed files with 81 additions and 81 deletions
2
git-flow
2
git-flow
|
@ -77,7 +77,7 @@ main() {
|
|||
if [ "$1" != "" ] && ! echo "$1" | grep -q "^-"; then
|
||||
SUBACTION="$1"; shift
|
||||
fi
|
||||
if ! typeset -f "cmd_$SUBACTION" 2>&1 >/dev/null; then
|
||||
if ! type "cmd_$SUBACTION" >/dev/null 2>&1; then
|
||||
warn "Unknown subcommand: '$SUBACTION'"
|
||||
usage
|
||||
exit 1
|
||||
|
|
|
@ -32,9 +32,9 @@ cmd_list() {
|
|||
DEFINE_boolean verbose false 'verbose (more) output' v
|
||||
parse_args "$@"
|
||||
|
||||
typeset feature_branches
|
||||
typeset current_branch
|
||||
typeset short_names
|
||||
local feature_branches
|
||||
local current_branch
|
||||
local short_names
|
||||
feature_branches=$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")
|
||||
if [ -z "$feature_branches" ]; then
|
||||
warn "No feature branches exist."
|
||||
|
@ -44,20 +44,20 @@ cmd_list() {
|
|||
short_names=$(echo "$feature_branches" | sed "s ^$PREFIX g")
|
||||
|
||||
# determine column width first
|
||||
typeset -i width=0
|
||||
typeset branch
|
||||
local width=0
|
||||
local branch
|
||||
for branch in $short_names; do
|
||||
typeset -i len=${#branch}
|
||||
local len=${#branch}
|
||||
width=$(max $width $len)
|
||||
done
|
||||
width=width+3
|
||||
width=$(($width+3))
|
||||
|
||||
typeset branch
|
||||
local branch
|
||||
for branch in $short_names; do
|
||||
typeset fullname=$PREFIX$branch
|
||||
typeset base=$(git merge-base "$fullname" "$DEVELOP_BRANCH")
|
||||
typeset develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
|
||||
typeset branch_sha=$(git rev-parse "$fullname")
|
||||
local fullname=$PREFIX$branch
|
||||
local base=$(git merge-base "$fullname" "$DEVELOP_BRANCH")
|
||||
local develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
|
||||
local branch_sha=$(git rev-parse "$fullname")
|
||||
if [ "$fullname" = "$current_branch" ]; then
|
||||
printf "* "
|
||||
else
|
||||
|
@ -97,8 +97,8 @@ require_name_arg() {
|
|||
expand_nameprefix_arg() {
|
||||
require_name_arg
|
||||
|
||||
typeset expanded_name
|
||||
typeset -i exitcode
|
||||
local expanded_name
|
||||
local exitcode
|
||||
expanded_name=$(resolve_nameprefix "$NAME" "$PREFIX")
|
||||
exitcode=$?
|
||||
case $exitcode in
|
||||
|
@ -114,7 +114,7 @@ expand_nameprefix_arg_or_current() {
|
|||
expand_nameprefix_arg
|
||||
gitflow_require_branch "$PREFIX$NAME"
|
||||
else
|
||||
typeset current_branch=$(gitflow_current_branch)
|
||||
local current_branch=$(gitflow_current_branch)
|
||||
if startswith "$current_branch" "$PREFIX"; then
|
||||
BRANCH=$current_branch
|
||||
NAME=${BRANCH#$PREFIX}
|
||||
|
@ -368,7 +368,7 @@ cmd_rebase() {
|
|||
gitflow_require_branch "$BRANCH"
|
||||
|
||||
git checkout -q "$BRANCH"
|
||||
typeset OPTS=
|
||||
local OPTS=
|
||||
if flag interactive; then
|
||||
OPTS="$OPTS -i"
|
||||
fi
|
||||
|
|
|
@ -29,9 +29,9 @@ cmd_list() {
|
|||
DEFINE_boolean verbose false 'verbose (more) output' v
|
||||
parse_args "$@"
|
||||
|
||||
typeset hotfix_branches
|
||||
typeset current_branch
|
||||
typeset short_names
|
||||
local hotfix_branches
|
||||
local current_branch
|
||||
local short_names
|
||||
hotfix_branches=$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")
|
||||
if [ -z "$hotfix_branches" ]; then
|
||||
warn "No hotfix branches exist."
|
||||
|
@ -41,20 +41,20 @@ cmd_list() {
|
|||
short_names=$(echo "$hotfix_branches" | sed "s ^$PREFIX g")
|
||||
|
||||
# determine column width first
|
||||
typeset -i width=0
|
||||
typeset branch
|
||||
local width=0
|
||||
local branch
|
||||
for branch in $short_names; do
|
||||
typeset -i len=${#branch}
|
||||
local len=${#branch}
|
||||
width=$(max $width $len)
|
||||
done
|
||||
width=width+3
|
||||
width=$(($width+3))
|
||||
|
||||
typeset branch
|
||||
local branch
|
||||
for branch in $short_names; do
|
||||
typeset fullname=$PREFIX$branch
|
||||
typeset base=$(git merge-base "$fullname" "$MASTER_BRANCH")
|
||||
typeset master_sha=$(git rev-parse "$MASTER_BRANCH")
|
||||
typeset branch_sha=$(git rev-parse "$fullname")
|
||||
local fullname=$PREFIX$branch
|
||||
local base=$(git merge-base "$fullname" "$MASTER_BRANCH")
|
||||
local master_sha=$(git rev-parse "$MASTER_BRANCH")
|
||||
local branch_sha=$(git rev-parse "$fullname")
|
||||
if [ "$fullname" = "$current_branch" ]; then
|
||||
printf "* "
|
||||
else
|
||||
|
@ -65,8 +65,8 @@ cmd_list() {
|
|||
if [ "$branch_sha" = "$master_sha" ]; then
|
||||
printf "(no commits yet)"
|
||||
else
|
||||
typeset tagname=$(git name-rev --tags --no-undefined --name-only "$base")
|
||||
typeset nicename
|
||||
local tagname=$(git name-rev --tags --no-undefined --name-only "$base")
|
||||
local nicename
|
||||
if [ "$tagname" != "" ]; then
|
||||
nicename=$tagname
|
||||
else
|
||||
|
@ -193,9 +193,9 @@ cmd_finish() {
|
|||
# try to tag the release
|
||||
# in case a previous attempt to finish this release branch has failed,
|
||||
# but the tag was set successful, we skip it now
|
||||
typeset tagname=$VERSION_PREFIX$VERSION
|
||||
local tagname=$VERSION_PREFIX$VERSION
|
||||
if ! gitflow_tag_exists "$tagname"; then
|
||||
typeset opts="-a"
|
||||
local opts="-a"
|
||||
flag sign && opts="$opts -s"
|
||||
[ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'"
|
||||
[ "$FLAGS_message" != "" ] && opts="$opts -m '$FLAGS_message'"
|
||||
|
|
|
@ -21,12 +21,12 @@ cmd_default() {
|
|||
echo
|
||||
echo "Summary of actions:"
|
||||
|
||||
if ! git rev-parse --git-dir 2>&1 >/dev/null; then
|
||||
if ! git rev-parse --git-dir >/dev/null 2>&1; then
|
||||
git init --quiet
|
||||
echo "- A new git repository at $PWD was created"
|
||||
fi
|
||||
|
||||
if ! git rev-parse --quiet --verify HEAD 2>&1 >/dev/null; then
|
||||
if ! git rev-parse --quiet --verify HEAD >/dev/null 2>&1; then
|
||||
touch "$README"
|
||||
git add "$README"
|
||||
git commit --quiet -m "initial commit"
|
||||
|
@ -36,7 +36,7 @@ cmd_default() {
|
|||
echo "- An initial commit was created at branch '$MASTER_BRANCH'"
|
||||
fi
|
||||
|
||||
if ! git rev-parse --verify "$MASTER_BRANCH" 2>&1 >/dev/null; then
|
||||
if ! git rev-parse --verify "$MASTER_BRANCH" >/dev/null 2>&1; then
|
||||
die "Cannot find your master branch. Try: git branch -m <mymaster> $MASTER_BRANCH"
|
||||
fi
|
||||
|
||||
|
@ -47,7 +47,7 @@ cmd_default() {
|
|||
gitflow_require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
|
||||
fi
|
||||
|
||||
if git rev-parse --verify "$DEVELOP_BRANCH" 2>&1 >/dev/null; then
|
||||
if git rev-parse --verify "$DEVELOP_BRANCH" >/dev/null 2>&1; then
|
||||
gitflow_require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
|
||||
else
|
||||
git checkout -q -b "$DEVELOP_BRANCH" "$MASTER_BRANCH"
|
||||
|
|
|
@ -40,9 +40,9 @@ cmd_list() {
|
|||
DEFINE_boolean verbose false 'verbose (more) output' v
|
||||
parse_args "$@"
|
||||
|
||||
typeset release_branches
|
||||
typeset current_branch
|
||||
typeset short_names
|
||||
local release_branches
|
||||
local current_branch
|
||||
local short_names
|
||||
release_branches=$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")
|
||||
if [ -z "$release_branches" ]; then
|
||||
warn "No release branches exist."
|
||||
|
@ -53,20 +53,20 @@ cmd_list() {
|
|||
short_names=$(echo "$release_branches" | sed "s ^$PREFIX g")
|
||||
|
||||
# determine column width first
|
||||
typeset -i width=0
|
||||
typeset branch
|
||||
local width=0
|
||||
local branch
|
||||
for branch in $short_names; do
|
||||
typeset -i len=${#branch}
|
||||
local len=${#branch}
|
||||
width=$(max $width $len)
|
||||
done
|
||||
width=width+3
|
||||
width=$(($width+3))
|
||||
|
||||
typeset branch
|
||||
local branch
|
||||
for branch in $short_names; do
|
||||
typeset fullname=$PREFIX$branch
|
||||
typeset base=$(git merge-base "$fullname" "$DEVELOP_BRANCH")
|
||||
typeset develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
|
||||
typeset branch_sha=$(git rev-parse "$fullname")
|
||||
local fullname=$PREFIX$branch
|
||||
local base=$(git merge-base "$fullname" "$DEVELOP_BRANCH")
|
||||
local develop_sha=$(git rev-parse "$DEVELOP_BRANCH")
|
||||
local branch_sha=$(git rev-parse "$fullname")
|
||||
if [ "$fullname" = "$current_branch" ]; then
|
||||
printf "* "
|
||||
else
|
||||
|
@ -77,7 +77,7 @@ cmd_list() {
|
|||
if [ "$branch_sha" = "$develop_sha" ]; then
|
||||
printf "(no commits yet)"
|
||||
else
|
||||
typeset nicename=$(git rev-parse --short "$base")
|
||||
local nicename=$(git rev-parse --short "$base")
|
||||
printf "(based on $nicename)"
|
||||
fi
|
||||
else
|
||||
|
@ -199,9 +199,9 @@ cmd_finish() {
|
|||
# try to tag the release
|
||||
# in case a previous attempt to finish this release branch has failed,
|
||||
# but the tag was set successful, we skip it now
|
||||
typeset tagname=$VERSION_PREFIX$VERSION
|
||||
local tagname=$VERSION_PREFIX$VERSION
|
||||
if ! gitflow_tag_exists "$tagname"; then
|
||||
typeset opts="-a"
|
||||
local opts="-a"
|
||||
flag sign && opts="$opts -s"
|
||||
[ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'"
|
||||
[ "$FLAGS_message" != "" ] && opts="$opts -m '$FLAGS_message'"
|
||||
|
|
|
@ -31,9 +31,9 @@ cmd_list() {
|
|||
DEFINE_boolean verbose false 'verbose (more) output' v
|
||||
parse_args "$@"
|
||||
|
||||
typeset support_branches
|
||||
typeset current_branch
|
||||
typeset short_names
|
||||
local support_branches
|
||||
local current_branch
|
||||
local short_names
|
||||
support_branches=$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")
|
||||
if [ -z "$support_branches" ]; then
|
||||
warn "No support branches exist."
|
||||
|
@ -43,20 +43,20 @@ cmd_list() {
|
|||
short_names=$(echo "$support_branches" | sed "s ^$PREFIX g")
|
||||
|
||||
# determine column width first
|
||||
typeset -i width=0
|
||||
typeset branch
|
||||
local width=0
|
||||
local branch
|
||||
for branch in $short_names; do
|
||||
typeset -i len=${#branch}
|
||||
local len=${#branch}
|
||||
width=$(max $width $len)
|
||||
done
|
||||
width=width+3
|
||||
width=$(($width+3))
|
||||
|
||||
typeset branch
|
||||
local branch
|
||||
for branch in $short_names; do
|
||||
typeset fullname=$PREFIX$branch
|
||||
typeset base=$(git merge-base "$fullname" "$MASTER_BRANCH")
|
||||
typeset master_sha=$(git rev-parse "$MASTER_BRANCH")
|
||||
typeset branch_sha=$(git rev-parse "$fullname")
|
||||
local fullname=$PREFIX$branch
|
||||
local base=$(git merge-base "$fullname" "$MASTER_BRANCH")
|
||||
local master_sha=$(git rev-parse "$MASTER_BRANCH")
|
||||
local branch_sha=$(git rev-parse "$fullname")
|
||||
if [ "$fullname" = "$current_branch" ]; then
|
||||
printf "* "
|
||||
else
|
||||
|
@ -67,8 +67,8 @@ cmd_list() {
|
|||
if [ "$branch_sha" = "$master_sha" ]; then
|
||||
printf "(no commits yet)"
|
||||
else
|
||||
typeset tagname=$(git name-rev --tags --no-undefined --name-only "$base")
|
||||
typeset nicename
|
||||
local tagname=$(git name-rev --tags --no-undefined --name-only "$base")
|
||||
local nicename
|
||||
if [ "$tagname" != "" ]; then
|
||||
nicename=$tagname
|
||||
else
|
||||
|
|
|
@ -18,7 +18,7 @@ die() { warn "$@"; exit 1; }
|
|||
|
||||
# set logic
|
||||
has() {
|
||||
typeset item=$1; shift
|
||||
local item=$1; shift
|
||||
echo " $@ " | grep -q " $item "
|
||||
}
|
||||
|
||||
|
@ -31,8 +31,8 @@ startswith() { [ "$1" != "${1#$2}" ]; }
|
|||
endswith() { [ "$1" != "${1#$2}" ]; }
|
||||
|
||||
# convenience functions for checking shFlags flags
|
||||
flag() { typeset FLAG; eval FLAG='$FLAGS_'$1; [ $FLAG -eq $FLAGS_TRUE ]; }
|
||||
noflag() { typeset FLAG; eval FLAG='$FLAGS_'$1; [ $FLAG -ne $FLAGS_TRUE ]; }
|
||||
flag() { local FLAG; eval FLAG='$FLAGS_'$1; [ $FLAG -eq $FLAGS_TRUE ]; }
|
||||
noflag() { local FLAG; eval FLAG='$FLAGS_'$1; [ $FLAG -ne $FLAGS_TRUE ]; }
|
||||
|
||||
#
|
||||
# Git specific common functionality
|
||||
|
@ -61,10 +61,10 @@ ALL_TAGS=$(git tag)
|
|||
# 2: Multiple matches found. These matches are written to stderr
|
||||
#
|
||||
resolve_nameprefix() {
|
||||
typeset name=$1
|
||||
typeset prefix=$2
|
||||
typeset matches
|
||||
typeset -i num_matches
|
||||
local name=$1
|
||||
local prefix=$2
|
||||
local matches
|
||||
local num_matches
|
||||
|
||||
# first, check if there is a perfect match
|
||||
if has "$LOCAL_BRANCHES" "$prefix$name"; then
|
||||
|
@ -109,7 +109,7 @@ gitflow_test_clean_working_tree() {
|
|||
|
||||
gitflow_require_clean_working_tree() {
|
||||
gitflow_test_clean_working_tree
|
||||
typeset -i result=$?
|
||||
local result=$?
|
||||
if [ $result -eq 1 ]; then
|
||||
die "fatal: Working tree contains unstaged changes. Aborting."
|
||||
fi
|
||||
|
@ -164,10 +164,10 @@ gitflow_tag_exists() {
|
|||
# 3 Branch needs a real merge
|
||||
#
|
||||
gitflow_test_branches_equal() {
|
||||
typeset commit1=$(git rev-parse "$1")
|
||||
typeset commit2=$(git rev-parse "$2")
|
||||
local commit1=$(git rev-parse "$1")
|
||||
local commit2=$(git rev-parse "$2")
|
||||
if [ "$commit1" != "$commit2" ]; then
|
||||
typeset base=$(git merge-base "$commit1" "$commit2")
|
||||
local base=$(git merge-base "$commit1" "$commit2")
|
||||
if [ "$commit1" = "$base" ]; then
|
||||
return 1
|
||||
elif [ "$commit2" = "$base" ]; then
|
||||
|
@ -184,7 +184,7 @@ gitflow_require_branches_equal() {
|
|||
gitflow_require_local_branch "$1"
|
||||
gitflow_require_remote_branch "$2"
|
||||
gitflow_test_branches_equal "$1" "$2"
|
||||
typeset -i status=$?
|
||||
local status=$?
|
||||
if [ $status -gt 0 ]; then
|
||||
warn "Branches '$1' and '$2' have diverged."
|
||||
if [ $status -eq 1 ]; then
|
||||
|
@ -204,8 +204,8 @@ gitflow_require_branches_equal() {
|
|||
# Checks whether branch $1 is succesfully merged into $2
|
||||
#
|
||||
gitflow_is_branch_merged_into() {
|
||||
typeset subject=$1
|
||||
typeset base=$2
|
||||
typeset all_merges=$(git branch --contains $subject | sed 's/^[* ] //')
|
||||
local subject=$1
|
||||
local base=$2
|
||||
local all_merges=$(git branch --contains $subject | sed 's/^[* ] //')
|
||||
has $base $all_merges
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue