Quote all variables in function/program arguments.
This commit is contained in:
parent
c5fcc01adb
commit
a4dd223d5b
5 changed files with 90 additions and 90 deletions
|
@ -148,17 +148,17 @@ cmd_start() {
|
|||
if noflag force; then
|
||||
gitflow_require_clean_working_tree
|
||||
fi
|
||||
gitflow_require_branch_absent $BRANCH
|
||||
gitflow_require_branch_absent "$BRANCH"
|
||||
|
||||
# update the local repo with remote changes, if asked
|
||||
if flag fetch; then
|
||||
git fetch -q $ORIGIN $DEVELOP_BRANCH
|
||||
git fetch -q "$ORIGIN" "$DEVELOP_BRANCH"
|
||||
fi
|
||||
|
||||
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
|
||||
gitflow_require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
|
||||
|
||||
# create branch
|
||||
if ! git checkout -b $BRANCH $BASE; then
|
||||
if ! git checkout -b "$BRANCH" "$BASE"; then
|
||||
die "Could not create feature branch '$BRANCH'"
|
||||
fi
|
||||
|
||||
|
@ -181,7 +181,7 @@ cmd_finish() {
|
|||
expand_nameprefix_arg
|
||||
|
||||
# sanity checks
|
||||
gitflow_require_branch $BRANCH
|
||||
gitflow_require_branch "$BRANCH"
|
||||
|
||||
# detect if we're restoring from a merge conflict
|
||||
if [ -f "$GIT_DIR/.gitflow/MERGE_BASE" ]; then
|
||||
|
@ -200,7 +200,7 @@ cmd_finish() {
|
|||
# Since the working tree is now clean, either the user did a
|
||||
# succesfull merge manually, or the merge was cancelled.
|
||||
# We detect this using gitflow_is_branch_merged_into()
|
||||
if gitflow_is_branch_merged_into $BRANCH $FINISH_BASE; then
|
||||
if gitflow_is_branch_merged_into "$BRANCH" "$FINISH_BASE"; then
|
||||
rm -f "$GIT_DIR/.gitflow/MERGE_BASE"
|
||||
helper_finish_cleanup
|
||||
exit 0
|
||||
|
@ -228,13 +228,13 @@ cmd_finish() {
|
|||
|
||||
# update local repo with remote changes first, if asked
|
||||
if flag fetch; then
|
||||
git fetch -q $ORIGIN $BRANCH
|
||||
git fetch -q "$ORIGIN" "$BRANCH"
|
||||
fi
|
||||
|
||||
if has $ORIGIN/$BRANCH $REMOTE_BRANCHES; then
|
||||
gitflow_require_branches_equal $BRANCH $ORIGIN/$BRANCH
|
||||
if has "$ORIGIN/$BRANCH" "$REMOTE_BRANCHES"; then
|
||||
gitflow_require_branches_equal "$BRANCH" "$ORIGIN/$BRANCH"
|
||||
fi
|
||||
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
|
||||
gitflow_require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
|
||||
|
||||
# if the user wants to rebase, do that first
|
||||
if flag rebase; then
|
||||
|
@ -248,11 +248,11 @@ cmd_finish() {
|
|||
fi
|
||||
|
||||
# merge into BASE
|
||||
git checkout $DEVELOP_BRANCH
|
||||
if [ "$(git rev-list -n2 $DEVELOP_BRANCH..$BRANCH | wc -l)" -eq 1 ]; then
|
||||
git merge --ff $BRANCH
|
||||
git checkout "$DEVELOP_BRANCH"
|
||||
if [ "$(git rev-list -n2 "$DEVELOP_BRANCH..$BRANCH" | wc -l)" -eq 1 ]; then
|
||||
git merge --ff "$BRANCH"
|
||||
else
|
||||
git merge --no-ff $BRANCH
|
||||
git merge --no-ff "$BRANCH"
|
||||
fi
|
||||
|
||||
if [ $? -ne 0 ]; then
|
||||
|
@ -277,14 +277,14 @@ cmd_finish() {
|
|||
|
||||
helper_finish_cleanup() {
|
||||
# sanity checks
|
||||
gitflow_require_branch $BRANCH
|
||||
gitflow_require_branch "$BRANCH"
|
||||
gitflow_require_clean_working_tree
|
||||
|
||||
# delete branch
|
||||
if flag fetch; then
|
||||
git push $ORIGIN :refs/heads/$BRANCH
|
||||
git push "$ORIGIN" ":refs/heads/$BRANCH"
|
||||
fi
|
||||
git branch -d $BRANCH
|
||||
git branch -d "$BRANCH"
|
||||
|
||||
echo
|
||||
echo "Summary of actions:"
|
||||
|
@ -301,18 +301,18 @@ cmd_publish() {
|
|||
|
||||
# sanity checks
|
||||
gitflow_require_clean_working_tree
|
||||
gitflow_require_branch $BRANCH
|
||||
git fetch -q $ORIGIN
|
||||
gitflow_require_branch_absent $ORIGIN/$BRANCH
|
||||
gitflow_require_branch "$BRANCH"
|
||||
git fetch -q "$ORIGIN"
|
||||
gitflow_require_branch_absent "$ORIGIN/$BRANCH"
|
||||
|
||||
# create remote branch
|
||||
git push $ORIGIN $BRANCH:refs/heads/$BRANCH
|
||||
git fetch -q $ORIGIN
|
||||
git push "$ORIGIN" "$BRANCH:refs/heads/$BRANCH"
|
||||
git fetch -q "$ORIGIN"
|
||||
|
||||
# configure remote tracking
|
||||
git config branch.$BRANCH.remote $ORIGIN
|
||||
git config branch.$BRANCH.merge refs/heads/$BRANCH
|
||||
git checkout $BRANCH
|
||||
git config "branch.$BRANCH.remote" "$ORIGIN"
|
||||
git config "branch.$BRANCH.merge" "refs/heads/$BRANCH"
|
||||
git checkout "$BRANCH"
|
||||
|
||||
echo
|
||||
echo "Summary of actions:"
|
||||
|
@ -328,12 +328,12 @@ cmd_track() {
|
|||
|
||||
# sanity checks
|
||||
gitflow_require_clean_working_tree
|
||||
gitflow_require_branch_absent $BRANCH
|
||||
git fetch -q $ORIGIN
|
||||
gitflow_require_branch $ORIGIN/$BRANCH
|
||||
gitflow_require_branch_absent "$BRANCH"
|
||||
git fetch -q "$ORIGIN"
|
||||
gitflow_require_branch "$ORIGIN/$BRANCH"
|
||||
|
||||
# create tracking branch
|
||||
git checkout -b $BRANCH $ORIGIN/$BRANCH
|
||||
git checkout -b "$BRANCH" "$ORIGIN/$BRANCH"
|
||||
|
||||
echo
|
||||
echo "Summary of actions:"
|
||||
|
@ -347,15 +347,15 @@ cmd_diff() {
|
|||
|
||||
if [ "$NAME" != "" ]; then
|
||||
expand_nameprefix_arg
|
||||
BASE=$(git merge-base $DEVELOP_BRANCH $BRANCH)
|
||||
git diff $BASE..$BRANCH
|
||||
BASE=$(git merge-base "$DEVELOP_BRANCH" "$BRANCH")
|
||||
git diff "$BASE..$BRANCH"
|
||||
else
|
||||
if ! gitflow_current_branch | grep -q "^$PREFIX"; then
|
||||
die "Not on a feature branch. Name one explicitly."
|
||||
fi
|
||||
|
||||
BASE=$(git merge-base $DEVELOP_BRANCH HEAD)
|
||||
git diff $BASE
|
||||
BASE=$(git merge-base "$DEVELOP_BRANCH" HEAD)
|
||||
git diff "$BASE"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
@ -65,12 +65,12 @@ 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 tagname=$(git name-rev --tags --no-undefined --name-only "$base")
|
||||
typeset nicename
|
||||
if [ "$tagname" != "" ]; then
|
||||
nicename=$tagname
|
||||
else
|
||||
nicename=$(git rev-parse --short $base)
|
||||
nicename=$(git rev-parse --short "$base")
|
||||
fi
|
||||
printf "(based on $nicename)"
|
||||
fi
|
||||
|
@ -121,15 +121,15 @@ cmd_start() {
|
|||
|
||||
# sanity checks
|
||||
gitflow_require_clean_working_tree
|
||||
gitflow_require_branch_absent $BRANCH
|
||||
gitflow_require_tag_absent $VERSION_PREFIX$VERSION
|
||||
gitflow_require_branch_absent "$BRANCH"
|
||||
gitflow_require_tag_absent "$VERSION_PREFIX$VERSION"
|
||||
if flag fetch; then
|
||||
git fetch -q $ORIGIN $MASTER_BRANCH
|
||||
git fetch -q "$ORIGIN" "$MASTER_BRANCH"
|
||||
fi
|
||||
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
|
||||
gitflow_require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
|
||||
|
||||
# create branch
|
||||
git checkout -b $BRANCH $BASE
|
||||
git checkout -b "$BRANCH" "$BASE"
|
||||
|
||||
echo
|
||||
echo "Summary of actions:"
|
||||
|
@ -159,24 +159,24 @@ cmd_finish() {
|
|||
fi
|
||||
|
||||
# sanity checks
|
||||
gitflow_require_branch $BRANCH
|
||||
gitflow_require_branch "$BRANCH"
|
||||
gitflow_require_clean_working_tree
|
||||
if flag fetch; then
|
||||
git fetch -q $ORIGIN $MASTER_BRANCH || \
|
||||
git fetch -q "$ORIGIN" "$MASTER_BRANCH" || \
|
||||
die "Could not fetch $MASTER_BRANCH from $ORIGIN."
|
||||
git fetch -q $ORIGIN $DEVELOP_BRANCH || \
|
||||
git fetch -q "$ORIGIN" "$DEVELOP_BRANCH" || \
|
||||
die "Could not fetch $DEVELOP_BRANCH from $ORIGIN."
|
||||
fi
|
||||
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
|
||||
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
|
||||
gitflow_require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
|
||||
gitflow_require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
|
||||
|
||||
# try to merge into master
|
||||
# in case a previous attempt to finish this release branch has failed,
|
||||
# but the merge into master was successful, we skip it now
|
||||
if ! gitflow_is_branch_merged_into $BRANCH $MASTER_BRANCH; then
|
||||
git checkout $MASTER_BRANCH || \
|
||||
if ! gitflow_is_branch_merged_into "$BRANCH" "$MASTER_BRANCH"; then
|
||||
git checkout "$MASTER_BRANCH" || \
|
||||
die "Could not check out $MASTER_BRANCH."
|
||||
git merge --no-ff $BRANCH || \
|
||||
git merge --no-ff "$BRANCH" || \
|
||||
die "There were merge conflicts."
|
||||
# TODO: What do we do now?
|
||||
fi
|
||||
|
@ -185,7 +185,7 @@ cmd_finish() {
|
|||
# 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
|
||||
if ! gitflow_tag_exists $tagname; then
|
||||
if ! gitflow_tag_exists "$tagname"; then
|
||||
typeset opts="-a"
|
||||
flag sign && opts="$opts -s"
|
||||
[ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'"
|
||||
|
@ -197,19 +197,19 @@ cmd_finish() {
|
|||
# try to merge into develop
|
||||
# in case a previous attempt to finish this release branch has failed,
|
||||
# but the merge into develop was successful, we skip it now
|
||||
if ! gitflow_is_branch_merged_into $BRANCH $DEVELOP_BRANCH; then
|
||||
git checkout $DEVELOP_BRANCH || \
|
||||
if ! gitflow_is_branch_merged_into "$BRANCH" "$DEVELOP_BRANCH"; then
|
||||
git checkout "$DEVELOP_BRANCH" || \
|
||||
die "Could not check out $DEVELOP_BRANCH."
|
||||
|
||||
# TODO: Actually, accounting for 'git describe' pays, so we should
|
||||
# ideally git merge --no-ff $tagname here, instead!
|
||||
git merge --no-ff $BRANCH || \
|
||||
git merge --no-ff "$BRANCH" || \
|
||||
die "There were merge conflicts."
|
||||
# TODO: What do we do now?
|
||||
fi
|
||||
|
||||
# delete branch
|
||||
git branch -d $BRANCH
|
||||
git branch -d "$BRANCH"
|
||||
|
||||
# TODO: Implement an optional push to master
|
||||
# git push origin develop; git push origin master; git push --tags origin
|
||||
|
|
|
@ -27,47 +27,47 @@ cmd_default() {
|
|||
fi
|
||||
|
||||
if ! git rev-parse --quiet --verify HEAD 2>&1 >/dev/null; then
|
||||
touch $README
|
||||
git add $README
|
||||
touch "$README"
|
||||
git add "$README"
|
||||
git commit --quiet -m "initial commit"
|
||||
if [ "$MASTER_BRANCH" != "master" ]; then
|
||||
git branch -m master $MASTER_BRANCH
|
||||
git branch -m master "$MASTER_BRANCH"
|
||||
fi
|
||||
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" 2>&1 >/dev/null; then
|
||||
die "Cannot find your master branch. Try: git branch -m <mymaster> $MASTER_BRANCH"
|
||||
fi
|
||||
|
||||
gitflow_require_clean_working_tree
|
||||
|
||||
if git remote | grep -q $ORIGIN; then
|
||||
git fetch -q $ORIGIN
|
||||
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
|
||||
if git remote | grep -q "$ORIGIN"; then
|
||||
git fetch -q "$ORIGIN"
|
||||
gitflow_require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
|
||||
fi
|
||||
|
||||
if git rev-parse --verify $DEVELOP_BRANCH 2>&1 >/dev/null; then
|
||||
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
|
||||
if git rev-parse --verify "$DEVELOP_BRANCH" 2>&1 >/dev/null; then
|
||||
gitflow_require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
|
||||
else
|
||||
git checkout -q -b $DEVELOP_BRANCH $MASTER_BRANCH
|
||||
git checkout -q -b "$DEVELOP_BRANCH" "$MASTER_BRANCH"
|
||||
echo "- A new branch '$DEVELOP_BRANCH' was created"
|
||||
echo "- You are now on branch '$DEVELOP_BRANCH'"
|
||||
fi
|
||||
|
||||
if ! git remote | grep -q $ORIGIN; then
|
||||
if ! git remote | grep -q "$ORIGIN"; then
|
||||
if [ "$1" = "" ]; then
|
||||
echo "- No remote location was added. Try: git remote add $ORIGIN <url>"
|
||||
else
|
||||
git remote add $ORIGIN $1
|
||||
git remote add "$ORIGIN" "$1"
|
||||
echo "- A new remote location '$1' was added"
|
||||
fi
|
||||
fi
|
||||
|
||||
echo
|
||||
|
||||
if git remote | grep -q $ORIGIN; then
|
||||
git push $ORIGIN $MASTER_BRANCH $DEVELOP_BRANCH
|
||||
if git remote | grep -q "$ORIGIN"; then
|
||||
git push "$ORIGIN" "$MASTER_BRANCH" "$DEVELOP_BRANCH"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
@ -77,7 +77,7 @@ cmd_list() {
|
|||
if [ "$branch_sha" = "$develop_sha" ]; then
|
||||
printf "(no commits yet)"
|
||||
else
|
||||
typeset nicename=$(git rev-parse --short $base)
|
||||
typeset nicename=$(git rev-parse --short "$base")
|
||||
printf "(based on $nicename)"
|
||||
fi
|
||||
else
|
||||
|
@ -127,15 +127,15 @@ cmd_start() {
|
|||
|
||||
# sanity checks
|
||||
gitflow_require_clean_working_tree
|
||||
gitflow_require_branch_absent $BRANCH
|
||||
gitflow_require_tag_absent $VERSION_PREFIX$VERSION
|
||||
gitflow_require_branch_absent "$BRANCH"
|
||||
gitflow_require_tag_absent "$VERSION_PREFIX$VERSION"
|
||||
if flag fetch; then
|
||||
git fetch -q $ORIGIN $DEVELOP_BRANCH
|
||||
git fetch -q "$ORIGIN" "$DEVELOP_BRANCH"
|
||||
fi
|
||||
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
|
||||
gitflow_require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
|
||||
|
||||
# create branch
|
||||
git checkout -b $BRANCH $BASE
|
||||
git checkout -b "$BRANCH" "$BASE"
|
||||
|
||||
echo
|
||||
echo "Summary of actions:"
|
||||
|
@ -165,24 +165,24 @@ cmd_finish() {
|
|||
fi
|
||||
|
||||
# sanity checks
|
||||
gitflow_require_branch $BRANCH
|
||||
gitflow_require_branch "$BRANCH"
|
||||
gitflow_require_clean_working_tree
|
||||
if flag fetch; then
|
||||
git fetch -q $ORIGIN $MASTER_BRANCH || \
|
||||
git fetch -q "$ORIGIN" "$MASTER_BRANCH" || \
|
||||
die "Could not fetch $MASTER_BRANCH from $ORIGIN."
|
||||
git fetch -q $ORIGIN $DEVELOP_BRANCH || \
|
||||
git fetch -q "$ORIGIN" "$DEVELOP_BRANCH" || \
|
||||
die "Could not fetch $DEVELOP_BRANCH from $ORIGIN."
|
||||
fi
|
||||
gitflow_require_branches_equal $MASTER_BRANCH $ORIGIN/$MASTER_BRANCH
|
||||
gitflow_require_branches_equal $DEVELOP_BRANCH $ORIGIN/$DEVELOP_BRANCH
|
||||
gitflow_require_branches_equal "$MASTER_BRANCH" "$ORIGIN/$MASTER_BRANCH"
|
||||
gitflow_require_branches_equal "$DEVELOP_BRANCH" "$ORIGIN/$DEVELOP_BRANCH"
|
||||
|
||||
# try to merge into master
|
||||
# in case a previous attempt to finish this release branch has failed,
|
||||
# but the merge into master was successful, we skip it now
|
||||
if ! gitflow_is_branch_merged_into $BRANCH $MASTER_BRANCH; then
|
||||
git checkout $MASTER_BRANCH || \
|
||||
if ! gitflow_is_branch_merged_into "$BRANCH" "$MASTER_BRANCH"; then
|
||||
git checkout "$MASTER_BRANCH" || \
|
||||
die "Could not check out $MASTER_BRANCH."
|
||||
git merge --no-ff $BRANCH || \
|
||||
git merge --no-ff "$BRANCH" || \
|
||||
die "There were merge conflicts."
|
||||
# TODO: What do we do now?
|
||||
fi
|
||||
|
@ -191,7 +191,7 @@ cmd_finish() {
|
|||
# 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
|
||||
if ! gitflow_tag_exists $tagname; then
|
||||
if ! gitflow_tag_exists "$tagname"; then
|
||||
typeset opts="-a"
|
||||
flag sign && opts="$opts -s"
|
||||
[ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'"
|
||||
|
@ -203,19 +203,19 @@ cmd_finish() {
|
|||
# try to merge into develop
|
||||
# in case a previous attempt to finish this release branch has failed,
|
||||
# but the merge into develop was successful, we skip it now
|
||||
if ! gitflow_is_branch_merged_into $BRANCH $DEVELOP_BRANCH; then
|
||||
git checkout $DEVELOP_BRANCH || \
|
||||
if ! gitflow_is_branch_merged_into "$BRANCH" "$DEVELOP_BRANCH"; then
|
||||
git checkout "$DEVELOP_BRANCH" || \
|
||||
die "Could not check out $DEVELOP_BRANCH."
|
||||
|
||||
# TODO: Actually, accounting for 'git describe' pays, so we should
|
||||
# ideally git merge --no-ff $tagname here, instead!
|
||||
git merge --no-ff $BRANCH || \
|
||||
git merge --no-ff "$BRANCH" || \
|
||||
die "There were merge conflicts."
|
||||
# TODO: What do we do now?
|
||||
fi
|
||||
|
||||
# delete branch
|
||||
git branch -d $BRANCH
|
||||
git branch -d "$BRANCH"
|
||||
|
||||
# TODO: Implement an optional push to master
|
||||
# git push origin develop; git push origin master; git push --tags origin
|
||||
|
|
|
@ -67,12 +67,12 @@ 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 tagname=$(git name-rev --tags --no-undefined --name-only "$base")
|
||||
typeset nicename
|
||||
if [ "$tagname" != "" ]; then
|
||||
nicename=$tagname
|
||||
else
|
||||
nicename=$(git rev-parse --short $base)
|
||||
nicename=$(git rev-parse --short "$base")
|
||||
fi
|
||||
printf "(based on $nicename)"
|
||||
fi
|
||||
|
@ -135,9 +135,9 @@ cmd_start() {
|
|||
|
||||
# fetch remote changes
|
||||
if flag fetch; then
|
||||
git fetch -q $ORIGIN $BASE
|
||||
git fetch -q "$ORIGIN" "$BASE"
|
||||
fi
|
||||
gitflow_require_branch_absent $BRANCH
|
||||
gitflow_require_branch_absent "$BRANCH"
|
||||
|
||||
# create branch
|
||||
git checkout -b "$BRANCH" "$BASE"
|
||||
|
|
Loading…
Reference in a new issue