Potential fix for unbound variable error using $GIT_REFLOG_ACTION (issue #150)

Author: jmurty

transcrypt

@@ -261,7 +261,7 @@ git_merge() {
 	# Look up name of the incoming "theirs" branch/ref being merged in.
 	# TODO There must be a better way of doing this than relying on this reflog
 	#      action environment variable, but I don't know what it is
-	if [[ "$GIT_REFLOG_ACTION" = "merge "* ]]; then
+	if [[ "${GIT_REFLOG_ACTION:-}" = "merge "* ]]; then
 		THEIRS_LABEL=$(echo "$GIT_REFLOG_ACTION" | awk '{print $2}')
 	fi
 	if [[ ! "$THEIRS_LABEL" ]]; then