Commit f7f687ce authored by Vincent Driessen's avatar Vincent Driessen

Also add basic skeleton implementation for the gitflow-feature and gitflow-release subcommands.

parent 61ade55f
#!/bin/sh
usage() {
echo "usage: gitflow start feature <name> [<base>]"
echo " gitflow finish feature <name>"
}
parse_args() {
# TODO: Implement the optional base argument
FEATURE="$1"
BASE="develop"
if [ "$FEATURE" = "" ]; then
echo "Missing argument <release>."
usage
exit 1
fi
}
start() {
# TODO
parse_args "$@"
gitflow_check_clean_working_tree
echo "git checkout -b $FEATURE $BASE"
}
finish() {
# TODO
parse_args "$@"
gitflow_check_clean_working_tree
echo "git checkout $BASE"
echo "git merge --no-ff $FEATURE"
}
......@@ -5,8 +5,18 @@ usage() {
echo " gitflow finish hotfix <release>"
}
parse_args() {
RELEASE="$1"
if [ "$RELEASE" = "" ]; then
echo "Missing argument <release>."
usage
exit 1
fi
}
start() {
# TODO
parse_args "$@"
gitflow_check_clean_working_tree
echo "git checkout -b hotfix-$RELEASE master"
echo "Bump version number"
......@@ -15,6 +25,7 @@ start() {
finish() {
# TODO
parse_args "$@"
gitflow_check_clean_working_tree
echo "git checkout master"
echo "git merge --no-ff hotfix-$RELEASE"
......
#!/bin/sh
usage() {
echo "usage: gitflow start release <release>"
echo " gitflow finish release <release>"
}
parse_args() {
RELEASE="$1"
if [ "$RELEASE" = "" ]; then
echo "Missing argument <release>."
usage
exit 1
fi
}
start() {
# TODO
parse_args "$@"
gitflow_check_clean_working_tree
echo "git checkout -b release-$RELEASE develop"
echo "Bump version number"
echo "Fix bug"
}
finish() {
# TODO
parse_args "$@"
gitflow_check_clean_working_tree
echo "git checkout master"
echo "git merge --no-ff release-$RELEASE"
echo "git checkout develop"
echo "git merge --no-ff release-$RELEASE"
echo "git branch -d release-$RELEASE"
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment