File tree 7 files changed +21
-0
lines changed
7 files changed +21
-0
lines changed Original file line number Diff line number Diff line change 4
4
# You must supply this script with a .patch file as the first argument
5
5
#
6
6
7
+ # exit script on first error
8
+ set -e
9
+
7
10
if [ -f " $1 " ]
8
11
then
9
12
FEATURE_NAME=` basename -s .patch $1 `
Original file line number Diff line number Diff line change 3
3
# Creates a git branch, aka a feature branch
4
4
# Prior to branching we're rebasing from SVN trunk which requires a clean master
5
5
6
+ # exit script on first error
7
+ set -e
8
+
6
9
if [ $# -eq 0 ]
7
10
then
8
11
echo " You must supply a branch name"
Original file line number Diff line number Diff line change 2
2
# g-cleanup
3
3
# Prunes old branches and runs maintenance tasks on the git repository
4
4
5
+ # exit script on first error
6
+ set -e
7
+
5
8
DEAD_WOOD=` git branch | grep DELETE | tr ' \n,*' ' ' `
6
9
7
10
read -p " Continue deleting the following branches? (Y/N) [${DEAD_WOOD} ] : " APPROVED
Original file line number Diff line number Diff line change 4
4
# Ideally suited for collaborators who do not have commit access to your SVN trunk
5
5
#
6
6
7
+ # exit script on first error
8
+ set -e
9
+
7
10
CURRENT=` git branch | grep ' \*' | awk ' {print $2}' `
8
11
CWD=` pwd`
9
12
Original file line number Diff line number Diff line change 3
3
# Initializes a local git repository based on our SVN repository
4
4
# This is only necessary to run once, all other g-* commands expect this repo
5
5
6
+ # exit script on first error
7
+ set -e
8
+
6
9
# Edit to suit
7
10
SVN_REPO=" svn+ssh://your.repo.url.here.com/foo"
8
11
LOCAL_REPO_NAME=" a-clever-name"
Original file line number Diff line number Diff line change 5
5
# Largely inspired by Rein's "hack && ship" scripts
6
6
# http://reinh.com/blog/2008/08/27/hack-and-and-ship.html
7
7
8
+ # exit script on first error
9
+ set -e
10
+
8
11
CURRENT=` git branch | grep ' \*' | awk ' {print $2}' `
9
12
if [ ${CURRENT} == " master" ]
10
13
then
Original file line number Diff line number Diff line change 7
7
# http://reinh.com/blog/2008/08/27/hack-and-and-ship.html
8
8
#
9
9
10
+ # exit script on first error
11
+ set -e
12
+
10
13
CURRENT=` git branch | grep ' \*' | awk ' {print $2}' `
11
14
git checkout master
12
15
git svn rebase
You can’t perform that action at this time.
0 commit comments