MeltwaterArchive · Nov 7, 2013 · Nov 7, 2013 · Nov 7, 2013 · Nov 7, 2013 · Nov 8, 2013
Showing with 23 additions and 10 deletions.

+9 −0 Makefile

+6 −6 git-hf-init

+7 −3 git-hf-release

+1 −1 hubflow-common
diff --git a/Makefile b/Makefile
@@ -0,0 +1,9 @@
+DESTDIR=
+prefix=/usr/local
+bindir=$(DESTDIR)/$(prefix)/bin
+
+install:
+	INSTALL_INTO=$(bindir) ./install.sh
+
+link:
+	for f in git-hf* hubflow-*; do ln -vfs $$PWD/$$f ~/bin/; done
diff --git a/git-hf-init b/git-hf-init
@@ -94,7 +94,7 @@ cmd_default() {
 		if [ "$branch_count" -eq 0 ]; then
 			echo "No branches exist yet. Base branches must be created now."
 			should_check_existence=NO
-			default_suggestion=$(git config --get hubflow.branch.master || echo master)
+			default_suggestion=$(git config --get hubflow.branch.master || echo production)
 		else
 			echo
 			echo "Which branch should be used for tracking production releases?"
@@ -103,7 +103,7 @@ cmd_default() {
 			should_check_existence=YES
 			default_suggestion=
 			for guess in $(git config --get hubflow.branch.master) \
-			             'production' 'main' 'master'; do
+			             'production' 'main'; do
 				if git_local_branch_exists "$guess"; then
 					default_suggestion="$guess"
 					break
@@ -112,7 +112,7 @@ cmd_default() {
 
 			if [ -z "$default_suggestion" ] ; then
 				for guess in $(git config --get hubflow.branch.master) \
-				             'production' 'main' 'master'; do
+				             'production' 'main'; do
 					if git_remote_branch_exists "origin/$guess"; then
 						default_suggestion="$guess"
 						break
@@ -122,7 +122,7 @@ cmd_default() {
 
 			# if we have no default at this point, use 'master'
 			if [ -z "$default_suggestion" ] ; then
-				default_suggestion="master"
+				default_suggestion="production"
 				should_check_existence="NO"
 			fi
 		fi
@@ -163,7 +163,7 @@ cmd_default() {
 		branch_count=$(git_local_branches | grep -v "^${master_branch}\$" | wc -l)
 		if [ "$branch_count" -eq 0 ]; then
 			should_check_existence=NO
-			default_suggestion=$(git config --get hubflow.branch.develop || echo develop)
+			default_suggestion=$(git config --get hubflow.branch.develop || echo master)
 		else
 			echo
 			echo "Which branch should be used for integration of the \"next release\"?"
@@ -330,7 +330,7 @@ cmd_default() {
 
 	# Version tag prefix
 	if ! git config --get hubflow.prefix.versiontag >/dev/null 2>&1 || flag force; then
-		default_suggestion=$(git config --get hubflow.prefix.versiontag || echo "")
+		default_suggestion=$(git config --get hubflow.prefix.versiontag || echo "v")
 		printf "Version tag prefix? [$default_suggestion] "
 		if flag ask; then
 			read answer

diff --git a/git-hf-release b/git-hf-release
@@ -187,6 +187,10 @@ cmd_start() {
 	# push it back up to remote repo
 	hubflow_push_latest_changes_to_origin
 
+	npm version --git-tag-version=false "$VERSION"
+	git-changelog
+	git add package.json CHANGES.md; git commit -m "v$VERSION"
+
 	echo
 	echo "Summary of actions:"
 	echo "- A new branch '$BRANCH' was created, based on '$BASE'"
@@ -253,7 +257,7 @@ cmd_finish() {
 	if ! git_is_branch_merged_into "$BRANCH" "$MASTER_BRANCH"; then
 		git checkout "$MASTER_BRANCH" || \
 		  die "Could not check out $MASTER_BRANCH."
-		git merge --no-ff -srecursive -Xtheirs "$BRANCH" || \
+		git merge --no-ff -srecursive -Xtheirs "$BRANCH" --no-edit || \
 		  die "There were merge conflicts."
 		  # TODO: What do we do now?
 	fi
@@ -268,7 +272,7 @@ cmd_finish() {
 			flag sign && opts="$opts -s"
 			[ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'"
 			[ "$FLAGS_message" != "" ] && opts="$opts -m '$FLAGS_message'"
-			eval git tag $opts "$tagname" || \
+			eval git tag $opts "$tagname" -m "$tagname" || \
 			die "Tagging failed. Please run finish again to retry."
 		fi
 	fi
@@ -284,7 +288,7 @@ cmd_finish() {
 			# branch - and the new tag (if provided) - a parent of the development
 			# branch, which in turn lets you use 'git describe' on either branch
 			if noflag notag; then
-				git merge --no-ff "$tagname" || \
+				git merge --no-ff "$tagname" --no-edit || \
 					die "There were merge conflicts."
 			else
 				git merge --no-ff "$MASTER_BRANCH" || \

diff --git a/hubflow-common b/hubflow-common
@@ -45,7 +45,7 @@
 #
 
 HUBFLOW_VERSION=1.5.2
-HUBFLOW_REPO=https://github.com/datasift/gitflow
+HUBFLOW_REPO=https://github.com/strongloop/gitflow
 
 #
 # Common functionality