Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 1 | # |
Vincent Driessen | 6c2d30b | 2010-01-26 22:18:36 +0100 | [diff] [blame] | 2 | # git-flow -- A collection of Git extensions to provide high-level |
| 3 | # repository operations for Vincent Driessen's branching model. |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 4 | # |
| 5 | # Original blog post presenting this model is found at: |
| 6 | # http://nvie.com/archives/323 |
| 7 | # |
| 8 | # Feel free to contribute to this project at: |
| 9 | # http://github.com/nvie/gitflow |
| 10 | # |
| 11 | # Copyright (c) 2010 by Vincent Driessen |
| 12 | # Copyright (c) 2010 by Benedikt Böhm |
| 13 | # |
| 14 | |
Benedikt Böhm | 49dd62b | 2010-01-28 00:51:15 +0100 | [diff] [blame] | 15 | VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag) |
| 16 | PREFIX=$(git config --get gitflow.prefix.support || echo support/) |
Vincent Driessen | 2acfffd | 2010-01-29 12:37:22 +0100 | [diff] [blame] | 17 | FLAG_FETCH=1 |
Benedikt Böhm | 49dd62b | 2010-01-28 00:51:15 +0100 | [diff] [blame] | 18 | |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 19 | usage() { |
Vincent Driessen | b866b01 | 2010-01-28 01:01:53 +0100 | [diff] [blame] | 20 | echo "usage: git flow support [list]" |
Vincent Driessen | 170dc74 | 2010-01-28 00:20:51 +0100 | [diff] [blame] | 21 | echo " git flow support start <version> [<base>]" |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 22 | } |
| 23 | |
Vincent Driessen | b866b01 | 2010-01-28 01:01:53 +0100 | [diff] [blame] | 24 | cmd_default() { |
| 25 | cmd_list "$@" |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 26 | } |
| 27 | |
Vincent Driessen | b866b01 | 2010-01-28 01:01:53 +0100 | [diff] [blame] | 28 | cmd_list() { |
Vincent Driessen | 170dc74 | 2010-01-28 00:20:51 +0100 | [diff] [blame] | 29 | SUPPORT_BRANCHES="$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")" |
| 30 | if [ -z "$SUPPORT_BRANCHES" ]; then |
| 31 | warn "No support branches exist." |
| 32 | exit 0 |
| 33 | fi |
| 34 | echo "$SUPPORT_BRANCHES" | sed "s?^$PREFIX??g" |
| 35 | } |
| 36 | |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 37 | cmd_help() { |
| 38 | usage |
| 39 | exit 0 |
| 40 | } |
| 41 | |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 42 | parse_args() { |
Vincent Driessen | 2acfffd | 2010-01-29 12:37:22 +0100 | [diff] [blame] | 43 | # TODO: When we have a nice structured way of parsing flags with getopt, |
| 44 | # implement the following flags: |
| 45 | # --fetch, to set FLAG_FETCH=1 |
| 46 | # --no-fetch, to set FLAG_FETCH=0 |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 47 | VERSION="$1" |
| 48 | BASE="${2:-${VERSION_PREFIX}${VERSION}}" |
| 49 | if [ "$VERSION" = "" ]; then |
| 50 | echo "Missing argument <version>." |
| 51 | usage |
| 52 | exit 1 |
| 53 | fi |
| 54 | BRANCH=$PREFIX$VERSION |
| 55 | } |
| 56 | |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 57 | cmd_start() { |
| 58 | parse_args "$@" |
| 59 | |
| 60 | # sanity checks |
Vincent Driessen | 4838644 | 2010-01-29 10:30:40 +0100 | [diff] [blame] | 61 | gitflow_require_clean_working_tree |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 62 | |
Vincent Driessen | 2acfffd | 2010-01-29 12:37:22 +0100 | [diff] [blame] | 63 | # fetch remote changes |
| 64 | if [ $FLAG_FETCH -eq 1 ]; then |
| 65 | git fetch -q $ORIGIN $BASE |
| 66 | fi |
| 67 | gitflow_require_branches_equal $BRANCH $ORIGIN/$BRANCH |
| 68 | |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 69 | # create branch |
| 70 | git checkout -b $BRANCH $BASE |
| 71 | |
| 72 | # publish branch |
Benedikt Böhm | 350e715 | 2010-01-26 13:05:05 +0100 | [diff] [blame] | 73 | git push $ORIGIN $BRANCH:refs/heads/$BRANCH |
Vincent Driessen | 2acfffd | 2010-01-29 12:37:22 +0100 | [diff] [blame] | 74 | |
Benedikt Böhm | 350e715 | 2010-01-26 13:05:05 +0100 | [diff] [blame] | 75 | git config branch.$BRANCH.remote $ORIGIN |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 76 | git config branch.$BRANCH.merge refs/heads/$BRANCH |
Vincent Driessen | a7d4527 | 2010-01-26 23:49:47 +0100 | [diff] [blame] | 77 | git checkout $BRANCH |
Benedikt Böhm | 00ccea6 | 2010-01-26 12:39:36 +0100 | [diff] [blame] | 78 | |
| 79 | echo |
| 80 | echo "Summary of actions:" |
| 81 | echo "- A new remote branch '$BRANCH' was created, based on '$BASE'" |
| 82 | echo "- A new tracking branch '$BRANCH' was created" |
| 83 | echo "- You are now on branch '$BRANCH'" |
| 84 | echo |
| 85 | } |