X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=a3665d7751cc836dc669390df7b972c29575037b;hb=a1a5a6347b4ac1005c5d9c2b636e906bf6c8ec12;hp=959261757c1fd8df50f7894ba449b76d621f3c45;hpb=6de33478affbf252066cc5863add213ca5cdc13c;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 959261757..a3665d775 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -83,8 +83,17 @@ merge_head=$(sed -e '/	not-for-merge	/d' \
 
 case "$merge_head" in
 '')
-	curr_branch=$(git-symbolic-ref HEAD | \
-		sed -e 's|^refs/heads/||')
+	curr_branch=$(git-symbolic-ref -q HEAD)
+	case $? in
+	  0) ;;
+	  1) echo >&2 "You are not currently on a branch; you must explicitly"
+	     echo >&2 "specify which branch you wish to merge:"
+	     echo >&2 "  git pull <remote> <branch>"
+	     exit 1;;
+	  *) exit $?;;
+	esac
+	curr_branch=${curr_branch#refs/heads/}
+
 	echo >&2 "Warning: No merge candidate found because value of config option
          \"branch.${curr_branch}.merge\" does not match any remote branch fetched."
 	echo >&2 "No changes."