git-commit: exit non-zero if we fail to commit the index

diff --git a/git-pull.sh b/git-pull.sh
index 30fdc57310897207f2e931396d184e94b48ad2ef..fa97b0f3562ab34b7cf1b7b68b293d9174121088 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -17,6 +17,9 @@ test -z "$(git ls-files -u)" ||
        die "You are in the middle of a conflicted merge."
 
 strategy_args= no_summary= no_commit= squash= no_ff=
+curr_branch=$(git symbolic-ref -q HEAD)
+curr_branch_short=$(echo "$curr_branch" | sed "s|refs/heads/||")
+rebase=$(git config --bool branch.$curr_branch_short.rebase)
 while :
 do
        case "$1" in
@@ -52,6 +55,12 @@ do
                esac
                strategy_args="${strategy_args}-s $strategy "
                ;;
+       -r|--r|--re|--reb|--reba|--rebas|--rebase)
+               rebase=true
+               ;;
+       --no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)
+               rebase=false
+               ;;
        -h|--h|--he|--hel|--help)
                usage
                ;;
@@ -63,6 +72,40 @@ do
        shift
 done
 
+error_on_no_merge_candidates () {
+       exec >&2
+       for opt
+       do
+               case "$opt" in
+               -t|--t|--ta|--tag|--tags)
+                       echo "Fetching tags only, you probably meant:"
+                       echo "  git fetch --tags"
+                       exit 1
+               esac
+       done
+
+       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."
+       exit 1
+}
+
 orig_head=$(git rev-parse --verify HEAD 2>/dev/null)
 git-fetch --update-head-ok "$@" || exit 1
 
@@ -95,35 +138,14 @@ merge_head=$(sed -e '/     not-for-merge   /d' \
 
 case "$merge_head" in
 '')
-       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 $?;;
+       0) error_on_no_merge_candidates "$@";;
+       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 "You asked me to pull without telling me which branch you"
-       echo >&2 "want to merge with, and 'branch.${curr_branch}.merge' in"
-       echo >&2 "your configuration file does not tell me either.  Please"
-       echo >&2 "name which branch you want to merge on the command line and"
-       echo >&2 "try again (e.g. 'git pull <repository> <refspec>')."
-       echo >&2 "See git-pull(1) for details on the refspec."
-       echo >&2
-       echo >&2 "If you often merge with the same branch, you may want to"
-       echo >&2 "configure the following variables in your configuration"
-       echo >&2 "file:"
-       echo >&2
-       echo >&2 "    branch.${curr_branch}.remote = <nickname>"
-       echo >&2 "    branch.${curr_branch}.merge = <remote-ref>"
-       echo >&2 "    remote.<nickname>.url = <url>"
-       echo >&2 "    remote.<nickname>.fetch = <refspec>"
-       echo >&2
-       echo >&2 "See git-config(1) for details."
-       exit 1
        ;;
 ?*' '?*)
        if test -z "$orig_head"
@@ -142,5 +164,6 @@ then
 fi
 
 merge_name=$(git fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
+test true = "$rebase" && exec git-rebase $merge_head
 exec git-merge $no_summary $no_commit $squash $no_ff $strategy_args \
        "$merge_name" HEAD $merge_head