TouchInstinct
/
checkstyle
311
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #1555: Use curly braces in variables in bash script 

Fixes `BashSimpleVarUsage` inspection violations.
This commit is contained in:
Michal Kordas 2015-08-31 23:34:29 +02:00 committed by Roman Ivanov
parent 5c5eafaa7e
commit aa7b68597a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fast-forward-merge.sh
View File

@ -7,31 +7,31 @@ example:
./$(basename "$0") checkstyle konstantinos issue73
"
exit 0;
exit 0;
fi
GIT_REPO=$1
FORK_USER_NAME=$2
USER_BRANCH=$3
REPO=$FORK_USER_NAME-fork
LOCAL_USER_BRANCH=$FORK_USER_NAME-$USER_BRANCH
REPO=${FORK_USER_NAME}-fork
LOCAL_USER_BRANCH=${FORK_USER_NAME}-${USER_BRANCH}
echo "adding remote ..."
git remote add $REPO https://github.com/$FORK_USER_NAME/$GIT_REPO.git
git fetch $REPO
git remote add ${REPO} https://github.com/${FORK_USER_NAME}/${GIT_REPO}.git
git fetch ${REPO}
echo "creating local branch ..."
git checkout -b $LOCAL_USER_BRANCH $REPO/$USER_BRANCH
git checkout -b ${LOCAL_USER_BRANCH} ${REPO}/${USER_BRANCH}
echo "rebasing over master ..."
git rebase master
echo "merge to master ..."
git checkout master
git merge $LOCAL_USER_BRANCH
git merge ${LOCAL_USER_BRANCH}
echo "removing local branch ..."
git branch -D $LOCAL_USER_BRANCH
git branch -D ${LOCAL_USER_BRANCH}
echo "removing remote ..."
git remote rm $REPO
git remote rm ${REPO}