Reset master, checkout head locally

There was a problem where adding new subtree splits for paths that did not exist
when master was originally checked out were not able to be created. Splits were
created correctly based on the commitish ( origin/master, etc. ) but if the path
did not exist in the working directory prior to `git subtree` being called the
subtree command would fail.

Author: simensen

git-subsplit.sh

@@ -216,12 +216,18 @@ subsplit_publish()
 			fi
 
 			say " - syncing branch '${HEAD}'"
+			git checkout master >/dev/null 2>&1
 			git branch -D "$LOCAL_BRANCH" >/dev/null 2>&1
+			git branch -D "${LOCAL_BRANCH}-checkout" >/dev/null 2>&1
+			git checkout -b "${LOCAL_BRANCH}-checkout" "origin/${HEAD}" >/dev/null 2>&1
 			git subtree split -q --prefix="$SUBPATH" --branch="$LOCAL_BRANCH" "origin/${HEAD}" >/dev/null
 
 			if [ -n "$VERBOSE" ];
 			then
+				echo "${DEBUG} git checkout master >/dev/null 2>&1"
 				echo "${DEBUG} git branch -D \"$LOCAL_BRANCH\" >/dev/null 2>&1"
+				echo "${DEBUG} git branch -D \"${LOCAL_BRANCH}-checkout\" >/dev/null 2>&1"
+				echo "${DEBUG} git checkout -b \"${LOCAL_BRANCH}-checkout\" \"origin/${HEAD}\" >/dev/null 2>&1"
 				echo "${DEBUG} git subtree split -q --prefix=\"$SUBPATH\" --branch=\"$LOCAL_BRANCH\" \"origin/${HEAD}\" >/dev/null"
 			fi
 
@@ -323,11 +329,15 @@ subsplit_update()
 
 	git fetch -q origin
 	git fetch -q -t origin
+	git checkout master
+	git reset --hard origin/master
 
 	if [ -n "$VERBOSE" ];
 	then
 		echo "${DEBUG} git fetch -q origin"
 		echo "${DEBUG} git fetch -q -t origin"
+		echo "${DEBUG} git checkout master"
+		echo "${DEBUG} git reset --hard origin/master"
 	fi
 
 	popd >/dev/null