Check if remote branch exists

kgryte · kgryte · commit 8176da3e6f44 · 2016-12-17T19:44:38.000-08:00
diff --git a/tools/git/hooks/pre-push b/tools/git/hooks/pre-push
@@ -42,8 +42,18 @@ cleanup() {
 
 # Checks if commits exist to push, as `git push` will execute regardless of whether commits exist to push or not.
 has_commits() {
-	echo 'Checking for commits to push...' >&2
-	local commits="$(git log origin/${GIT_CURRENT_BRANCH}..${GIT_CURRENT_BRANCH} -- --oneline)"
+	local commits
+
+	echo 'Checking if remote branch exists...' >&2
+	if git branch -r | grep "${GIT_CURRENT_BRANCH}"; then
+		echo 'Remote branch exists.' >&2
+		echo 'Checking for commits to push...' >&2
+		commits=$(git log origin/"${GIT_CURRENT_BRANCH}".."${GIT_CURRENT_BRANCH}" -- --oneline)
+	else
+		echo 'Remote branch does not exist.' >&2
+		echo 'Checking for commits to push...' >&2
+		commits=$(git log "${GIT_CURRENT_BRANCH}" -- --oneline)
+	fi
 	if [[ -z "${commits}" ]]; then
 		echo 'No commits to push.'
 	    return 1
@@ -82,6 +92,7 @@ main() {
 	if [[ "$?" -ne 0 ]]; then
 		on_error 1
 	fi
+	exit 1
 	check_licenses
 	if [[ "$?" -ne 0 ]]; then
 		on_error 1
