difftool/mergetool: make the form of yes/no questions consistent

Every yes/no question in difftool/mergetool scripts has slightly
different form, and none of them is consistent with the form git
itself uses.

Make the form of all the questions consistent with the form used
by git.

Reviewed-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Nikola Forró <nforro@redhat.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 2b11b1d6fe33cf3f61dd35b8f48d6953f7a25bff..84d6cc021c51ac53b68a8b9fdbdd3ed0f8d9d30a 100755 (executable)
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -44,10 +44,10 @@ launch_merge_tool () {
                        "$GIT_DIFF_PATH_TOTAL" "$MERGED"
                if use_ext_cmd
                then
                        "$GIT_DIFF_PATH_TOTAL" "$MERGED"
                if use_ext_cmd
                then

-                       printf "Launch '%s' [Y/n]: " \
+                       printf "Launch '%s' [Y/n]? " \

                                "$GIT_DIFFTOOL_EXTCMD"
                else
                                "$GIT_DIFFTOOL_EXTCMD"
                else

-                       printf "Launch '%s' [Y/n]: " "$merge_tool"
+                       printf "Launch '%s' [Y/n]? " "$merge_tool"

                fi
                read ans || return
                if test "$ans" = n
                fi
                read ans || return
                if test "$ans" = n

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 54ac8e484674710ca21ea0038d07dcbefbe2fb1e..92adcc0d0785f8b78fce2c49bbcc40e49020ee24 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -100,7 +100,7 @@ check_unchanged () {
                while true
                do
                        echo "$MERGED seems unchanged."
                while true
                do
                        echo "$MERGED seems unchanged."

-                       printf "Was the merge successful? [y/n] "
+                       printf "Was the merge successful [y/n]? "

                        read answer || return 1
                        case "$answer" in
                        y*|Y*) return 0 ;;
                        read answer || return 1
                        case "$answer" in
                        y*|Y*) return 0 ;;

diff --git a/git-mergetool.sh b/git-mergetool.sh
index 9f77e3a8bb0b1197f860912b6d0e56b40b607cb9..2e0635a15cd34911df948ad1b228b5a5f800a4cc 100755 (executable)
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -396,7 +396,7 @@ done
 prompt_after_failed_merge () {
        while true
        do
 prompt_after_failed_merge () {
        while true
        do

-               printf "Continue merging other unresolved paths (y/n) ? "
+               printf "Continue merging other unresolved paths [y/n]? "

                read ans || return 1
                case "$ans" in
                [yY]*)
                read ans || return 1
                case "$ans" in
                [yY]*)

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index ec8bc8c7656fd7f0fd03226b5491f5bc9d532dd7..df9050f4ef09dcc423e7c8c996541b38932e3691 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -20,7 +20,7 @@ difftool_test_setup ()
 prompt_given ()
 {
        prompt="$1"
 prompt_given ()
 {
        prompt="$1"

-       test "$prompt" = "Launch 'test-tool' [Y/n]: branch"
+       test "$prompt" = "Launch 'test-tool' [Y/n]? branch"

 }
 
 # Create a file on master and change it on branch
 }
 
 # Create a file on master and change it on branch