diff options
| author | Nikola Forró <nforro@redhat.com> | 2016-04-12 16:44:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-25 15:15:17 -0700 |
| commit | cce076e37107217faa942dddc20e79ae7350bc1f (patch) | |
| tree | 75c4cfa723fddad28349318907bf2ec8a39b8633 | |
| parent | e46579643d56162299b1756b70d418005351b256 (diff) | |
| download | git-cce076e37107217faa942dddc20e79ae7350bc1f.tar.gz git-cce076e37107217faa942dddc20e79ae7350bc1f.tar.xz | |
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>
| -rwxr-xr-x | git-difftool--helper.sh | 4 | ||||
| -rw-r--r-- | git-mergetool--lib.sh | 2 | ||||
| -rwxr-xr-x | git-mergetool.sh | 2 | ||||
| -rwxr-xr-x | t/t7800-difftool.sh | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index 2b11b1d6f..84d6cc021 100755 --- 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 - printf "Launch '%s' [Y/n]: " \ + printf "Launch '%s' [Y/n]? " \ "$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 diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 54ac8e484..92adcc0d0 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -100,7 +100,7 @@ check_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 ;; diff --git a/git-mergetool.sh b/git-mergetool.sh index 9f77e3a8b..2e0635a15 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -396,7 +396,7 @@ done 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]*) diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index ec8bc8c76..df9050f4e 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -20,7 +20,7 @@ difftool_test_setup () 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 |