Re: [PATCH] difftool/mergetool: make the form of yes/no questions consistent
From: Junio C Hamano <hidden>
Date: 2016-06-16 02:18:45
Nikola Forró [off-list ref] writes:
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, i.e. "Question [y/n]? ". Signed-off-by: Nikola Forró <redacted> ---
Looks good from a cursory read. David?
quoted hunk
git-difftool--helper.sh | 4 ++-- git-mergetool--lib.sh | 2 +- git-mergetool.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index 2b11b1d..84d6cc0 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" = ndiff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 54ac8e4..92adcc0 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 9f77e3a..2e0635a 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]*)