Fix export_marks() error handling.

diff --git a/git-pull.sh b/git-pull.sh
index 8a26763206dbd852aacb15db7f5319eb35678a29..cab367ada009659da23774ec303119af3d972038 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -90,23 +90,31 @@ error_on_no_merge_candidates () {
 
        curr_branch=${curr_branch#refs/heads/}
 
-       echo "You asked me to pull without telling me which branch you"
-       echo "want to merge with, and 'branch.${curr_branch}.merge' in"
-       echo "your configuration file does not tell me either.  Please"
-       echo "name which branch you want to merge on the command line and"
-       echo "try again (e.g. 'git pull <repository> <refspec>')."
-       echo "See git-pull(1) for details on the refspec."
-       echo
-       echo "If you often merge with the same branch, you may want to"
-       echo "configure the following variables in your configuration"
-       echo "file:"
-       echo
-       echo "    branch.${curr_branch}.remote = <nickname>"
-       echo "    branch.${curr_branch}.merge = <remote-ref>"
-       echo "    remote.<nickname>.url = <url>"
-       echo "    remote.<nickname>.fetch = <refspec>"
-       echo
-       echo "See git-config(1) for details."
+       if [ -z "$curr_branch" ]; then
+               echo "You are not currently on a branch, so I cannot use any"
+               echo "'branch.<branchname>.merge' in your configuration file."
+               echo "Please specify which branch you want to merge on the command"
+               echo "line and try again (e.g. 'git pull <repository> <refspec>')."
+               echo "See git-pull(1) for details."
+       else
+               echo "You asked me to pull without telling me which branch you"
+               echo "want to merge with, and 'branch.${curr_branch}.merge' in"
+               echo "your configuration file does not tell me either.  Please"
+               echo "specify which branch you want to merge on the command line and"
+               echo "try again (e.g. 'git pull <repository> <refspec>')."
+               echo "See git-pull(1) for details."
+               echo
+               echo "If you often merge with the same branch, you may want to"
+               echo "configure the following variables in your configuration"
+               echo "file:"
+               echo
+               echo "    branch.${curr_branch}.remote = <nickname>"
+               echo "    branch.${curr_branch}.merge = <remote-ref>"
+               echo "    remote.<nickname>.url = <url>"
+               echo "    remote.<nickname>.fetch = <refspec>"
+               echo
+               echo "See git-config(1) for details."
+       fi
        exit 1
 }
 
@@ -139,7 +147,7 @@ then
        echo >&2 "Warning: fetch updated the current branch head."
        echo >&2 "Warning: fast forwarding your working tree from"
        echo >&2 "Warning: commit $orig_head."
-       git update-index --refresh 2>/dev/null
+       git update-index -q --refresh
        git read-tree -u -m "$orig_head" "$curr_head" ||
                die 'Cannot fast-forward your working tree.
 After making sure that you saved anything precious from
@@ -168,13 +176,11 @@ case "$merge_head" in
 ?*' '?*)
        if test -z "$orig_head"
        then
-               echo >&2 "Cannot merge multiple branches into empty head"
-               exit 1
+               die "Cannot merge multiple branches into empty head"
        fi
        if test true = "$rebase"
        then
-               echo >&2 "Cannot rebase onto multiple branches"
-               exit 1
+               die "Cannot rebase onto multiple branches"
        fi
        ;;
 esac