rebase: validate -C<n> and --whitespace=<mode> parameters early

diff --git a/git-mergetool.sh b/git-mergetool.sh
index b2cd0a497bb7c9d55c5b81bbd3349e56815b1f09..01b9ad59b24ff77221d5db4118c9d0265dc25fad 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -9,7 +9,7 @@
 # at the discretion of Junio C Hamano.
 #
 
-USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [file to merge] ...'
+USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-g|--gui|--no-gui] [-O<orderfile>] [file to merge] ...'
 SUBDIRECTORY_OK=Yes
 NONGIT_OK=Yes
 OPTIONS_SPEC=
@@ -382,9 +382,16 @@ prompt_after_failed_merge () {
        done
 }
 
+print_noop_and_exit () {
+       echo "No files need merging"
+       exit 0
+}
+
 main () {
        prompt=$(git config --bool mergetool.prompt)
+       gui_tool=false
        guessed_merge_tool=false
+       orderfile=
 
        while test $# != 0
        do
@@ -408,12 +415,21 @@ main () {
                                shift ;;
                        esac
                        ;;
+               --no-gui)
+                       gui_tool=false
+                       ;;
+               -g|--gui)
+                       gui_tool=true
+                       ;;
                -y|--no-prompt)
                        prompt=false
                        ;;
                --prompt)
                        prompt=true
                        ;;
+               -O*)
+                       orderfile="${1#-O}"
+                       ;;
                --)
                        shift
                        break
@@ -434,7 +450,7 @@ main () {
        if test -z "$merge_tool"
        then
                # Check if a merge tool has been configured
-               merge_tool=$(get_configured_merge_tool)
+               merge_tool=$(get_configured_merge_tool $gui_tool)
                # Try to guess an appropriate merge tool if no tool has been set.
                if test -z "$merge_tool"
                then
@@ -445,42 +461,53 @@ main () {
        merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
        merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"
 
-       files=
+       prefix=$(git rev-parse --show-prefix) || exit 1
+       cd_to_toplevel
 
-       if test $# -eq 0
+       if test -n "$orderfile"
        then
-               cd_to_toplevel
+               orderfile=$(
+                       git rev-parse --prefix "$prefix" -- "$orderfile" |
+                       sed -e 1d
+               )
+       fi
 
-               if test -e "$GIT_DIR/MERGE_RR"
+       if test $# -eq 0 && test -e "$GIT_DIR/MERGE_RR"
+       then
+               set -- $(git rerere remaining)
+               if test $# -eq 0
                then
-                       files=$(git rerere remaining)
-               else
-                       files=$(git ls-files -u |
-                               sed -e 's/^[^   ]*      //' | sort -u)
+                       print_noop_and_exit
                fi
-       else
-               files=$(git ls-files -u -- "$@" |
-                       sed -e 's/^[^   ]*      //' | sort -u)
+       elif test $# -ge 0
+       then
+               # rev-parse provides the -- needed for 'set'
+               eval "set $(git rev-parse --sq --prefix "$prefix" -- "$@")"
        fi
 
+       files=$(git -c core.quotePath=false \
+               diff --name-only --diff-filter=U \
+               ${orderfile:+"-O$orderfile"} -- "$@")
+
        if test -z "$files"
        then
-               echo "No files need merging"
-               exit 0
+               print_noop_and_exit
        fi
 
        printf "Merging:\n"
        printf "%s\n" "$files"
 
        rc=0
-       for i in $files
+       set -- $files
+       while test $# -ne 0
        do
                printf "\n"
-               if ! merge_file "$i"
+               if ! merge_file "$1"
                then
                        rc=1
-                       prompt_after_failed_merge || exit 1
+                       test $# -ne 1 && prompt_after_failed_merge || exit 1
                fi
+               shift
        done
 
        exit $rc