refactor to functions; require clean work tree

mvbalaw · Feb 20, 2012 · 4782264 · 4782264
1 parent c75312f
commit 4782264
Show file tree

Hide file tree

Showing 2 changed files with 122 additions and 39 deletions.
diff --git a/scripts/hack.sh b/scripts/hack.sh
@@ -1,28 +1,69 @@
 #!/bin/sh +x
-# hack: Merge the latest changes from the remote branch into your current branch
-# Git workflow hack script based on: http://reinh.com/blog/2008/08/27/hack-and-and-ship.html
-CURRENT="$(git branch | grep '\*' | awk '{print $2}')"
-echo "current branch is: ${CURRENT}"
-remoteBranches="$(git branch -r | grep -v 'HEAD' | tr '/' ' ' | awk '{print $2}')"
-for branch in ${remoteBranches}
-do
-	if [ "${CURRENT}" == "$(git branch --contains ${branch} | grep '\*' | awk '{print $2}')" ]
+# hack: rebase your changes onto the latest changes from the remote branch
+
+require_clean_work_tree () {
+	# http://stackoverflow.com/questions/3878624/how-do-i-programmatically-determine-if-there-are-uncommited-changes
+    # Update the index
+    git update-index -q --ignore-submodules --refresh
+    err=0
+
+    # Disallow unstaged changes in the working tree
+    if ! git diff-files --quiet --ignore-submodules --
+    then
+        echo >&2 "cannot $1: you have unstaged changes."
+        git diff-files --name-status -r --ignore-submodules -- >&2
+        err=1
+    fi
+
+    # Disallow uncommitted changes in the index
+    if ! git diff-index --cached --quiet HEAD --ignore-submodules --
+    then
+        echo >&2 "cannot $1: your index contains uncommitted changes."
+        git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
+        err=1
+    fi
+
+    if [ $err = 1 ]
+    then
+        echo >&2 "Please commit or stash them."
+        exit 1
+    fi
+}
+
+determine_remote_branch () {
+	remoteBranches="$(git branch -r | grep -v 'HEAD' | tr '/' ' ' | awk '{print $2}')"
+	for branch in ${remoteBranches}
+	do
+		if [ "${CURRENT}" == "$(git branch --contains ${branch} | grep '\*' | awk '{print $2}')" ]
+		then
+			remote=$branch
+			return
+		fi
+	done
+	if [ "" == "${remote}" ] 
+	then
+		currentBranches="$(git branch --contains ${CURRENT} | grep -v '\*' | awk '{print $1}')"
+		remote="$(echo ${remoteBranches} ${currentBranches} | tr ' ' '\n' | sort | uniq -c | grep "2" | awk '{print $2}' | head -1)"
+	fi
+}
+
+assert_working_on_feature_branch () {
+	if [ "${CURRENT}" == "${remote}" -o "" == "${remote}" ] 
 	then
-		remote=$branch
+		echo "This command should be run from a feature branch, not from ${CURRENT}."
+		exit 1;
 	fi
-done
-if [ "" == "${remote}" ] 
-then
-	currentBranches="$(git branch --contains ${CURRENT} | grep -v '\*' | awk '{print $1}')"
-	remote="$(echo ${remoteBranches} ${currentBranches} | tr ' ' '\n' | sort | uniq -c | grep "2" | awk '{print $2}' | head -1)"
-fi
+}
+
+require_clean_work_tree
+CURRENT="$(git branch | grep '\*' | awk '{print $2}')"
+echo "current branch is: ${CURRENT}"
+determine_remote_branch
 echo "remote branch is: ${remote}"
-if [ "${CURRENT}" == "${remote}" -o "" == "${remote}" ] 
-then
-	echo "This command should be run from a feature branch, not from ${CURRENT}."
-	exit 1;
-fi
+assert_working_on_feature_branch
 set -x
+
+# do the work
 git checkout $remote
 git pull origin $remote
 git checkout ${CURRENT}

diff --git a/scripts/ship.sh b/scripts/ship.sh
@@ -1,27 +1,69 @@
 #!/bin/sh +x
-# Git workflow ship script
-CURRENT="$(git branch | grep '\*' | awk '{print $2}')"
-echo "current branch is: ${CURRENT}"
-remoteBranches="$(git branch -r | grep -v 'HEAD' | tr '/' ' ' | awk '{print $2}')"
-for branch in ${remoteBranches}
-do
-	if [ "${CURRENT}" == "$(git branch --contains ${branch} | grep '\*' | awk '{print $2}')" ]
+# ship: fast forward merge and push your changes to the remote branch
+
+require_clean_work_tree () {
+	# http://stackoverflow.com/questions/3878624/how-do-i-programmatically-determine-if-there-are-uncommited-changes
+    # Update the index
+    git update-index -q --ignore-submodules --refresh
+    err=0
+
+    # Disallow unstaged changes in the working tree
+    if ! git diff-files --quiet --ignore-submodules --
+    then
+        echo >&2 "cannot $1: you have unstaged changes."
+        git diff-files --name-status -r --ignore-submodules -- >&2
+        err=1
+    fi
+
+    # Disallow uncommitted changes in the index
+    if ! git diff-index --cached --quiet HEAD --ignore-submodules --
+    then
+        echo >&2 "cannot $1: your index contains uncommitted changes."
+        git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
+        err=1
+    fi
+
+    if [ $err = 1 ]
+    then
+        echo >&2 "Please commit or stash them."
+        exit 1
+    fi
+}
+
+determine_remote_branch () {
+	remoteBranches="$(git branch -r | grep -v 'HEAD' | tr '/' ' ' | awk '{print $2}')"
+	for branch in ${remoteBranches}
+	do
+		if [ "${CURRENT}" == "$(git branch --contains ${branch} | grep '\*' | awk '{print $2}')" ]
+		then
+			remote=$branch
+			return
+		fi
+	done
+	if [ "" == "${remote}" ] 
+	then
+		currentBranches="$(git branch --contains ${CURRENT} | grep -v '\*' | awk '{print $1}')"
+		remote="$(echo ${remoteBranches} ${currentBranches} | tr ' ' '\n' | sort | uniq -c | grep "2" | awk '{print $2}' | head -1)"
+	fi
+}
+
+assert_working_on_feature_branch () {
+	if [ "${CURRENT}" == "${remote}" -o "" == "${remote}" ] 
 	then
-		remote=$branch
+		echo "This command should be run from a feature branch, not from ${CURRENT}."
+		exit 1;
 	fi
-done
-if [ "" == "${remote}" ] 
-then
-	currentBranches="$(git branch --contains ${CURRENT} | grep -v '\*' | awk '{print $1}')"
-	remote="$(echo ${remoteBranches} ${currentBranches} | tr ' ' '\n' | sort | uniq -c | grep "2" | awk '{print $2}' | head -1)"
-fi
+}
+
+require_clean_work_tree
+CURRENT="$(git branch | grep '\*' | awk '{print $2}')"
+echo "current branch is: ${CURRENT}"
+determine_remote_branch
 echo "remote branch is: ${remote}"
-if [ "${CURRENT}" == "${remote}" -o "" == "${remote}" ] 
-then
-	echo "This command should be run from a feature branch, not from ${CURRENT}."
-	exit 1;
-fi
+assert_working_on_feature_branch
 set -x
+
+# do the work
 git checkout $remote
 git merge ${CURRENT}
 git push origin $remote