pull --rebase: exit early when the working directory is dirty

diff --git a/git-pull.sh b/git-pull.sh
index ad442264cbae0003dc548b85769cbeb2107c7d5f..0917d0d056573912df60afd7b556efe04eeebae8 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -54,8 +54,11 @@ then
 fi
 
 # Setup default fast-forward options via `pull.ff`
-pull_ff=$(git config pull.ff)
+pull_ff=$(bool_or_string_config pull.ff)
 case "$pull_ff" in
+true)
+       no_ff=--ff
+       ;;
 false)
        no_ff=--no-ff
        ;;
@@ -81,8 +84,8 @@ do
                diffstat=--no-stat ;;
        --stat|--summary)
                diffstat=--stat ;;
-       --log|--no-log)
-               log_arg=$1 ;;
+       --log|--log=*|--no-log)
+               log_arg="$1" ;;
        --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
                no_commit=--no-commit ;;
        --c|--co|--com|--comm|--commi|--commit)
@@ -190,15 +193,6 @@ esac
 
 error_on_no_merge_candidates () {
        exec >&2
-       for opt
-       do
-               case "$opt" in
-               -t|--t|--ta|--tag|--tags)
-                       echo "It doesn't make sense to pull all tags; you probably meant:"
-                       echo "  git fetch --tags"
-                       exit 1
-               esac
-       done
 
        if test true = "$rebase"
        then
@@ -323,7 +317,6 @@ then
        fi
 fi
 
-merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
 case "$rebase" in
 true)
        eval="git-rebase $diffstat $strategy_args $merge_args $rebase_args $verbosity"
@@ -334,7 +327,7 @@ true)
        eval="git-merge $diffstat $no_commit $verify_signatures $edit $squash $no_ff $ff_only"
        eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress"
        eval="$eval $gpg_sign_args"
-       eval="$eval \"\$merge_name\" HEAD $merge_head"
+       eval="$eval FETCH_HEAD"
        ;;
 esac
 eval "exec $eval"