mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 12:59:41 +01:00
Code Activity

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

Browse source 
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>
This commit is contained in:
Nikola Forró 2016-04-12 16:44:20 +02:00 committed by Junio C Hamano
parent e46579643d
commit cce076e371
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
git-difftool--helper.sh
View file

@ -44,10 +44,10 @@ launch_merge_tool () {
"$GIT_DIFF_PATH_TOTAL" "$MERGED" "$GIT_DIFF_PATH_TOTAL" "$MERGED"
if use_ext_cmd if use_ext_cmd
then then
printf "Launch '%s' [Y/n]: " \ printf "Launch '%s' [Y/n]? " \
"$GIT_DIFFTOOL_EXTCMD" "$GIT_DIFFTOOL_EXTCMD"
else else
printf "Launch '%s' [Y/n]: " "$merge_tool" printf "Launch '%s' [Y/n]? " "$merge_tool"
fi fi
read ans || return read ans || return
if test "$ans" = n if test "$ans" = n

2
git-mergetool--lib.sh
View file

@ -100,7 +100,7 @@ check_unchanged () {
while true while true
do do
echo "$MERGED seems unchanged." echo "$MERGED seems unchanged."
printf "Was the merge successful? [y/n] " printf "Was the merge successful [y/n]? "
read answer || return 1 read answer || return 1
case "$answer" in case "$answer" in
y*|Y*) return 0 ;; y*|Y*) return 0 ;;

2
git-mergetool.sh
View file

@ -396,7 +396,7 @@ done
prompt_after_failed_merge () { prompt_after_failed_merge () {
while true while true
do do
printf "Continue merging other unresolved paths (y/n) ? " printf "Continue merging other unresolved paths [y/n]? "
read ans || return 1 read ans || return 1
case "$ans" in case "$ans" in
[yY]*) [yY]*)

2
t/t7800-difftool.sh
View file

@ -20,7 +20,7 @@ difftool_test_setup ()
prompt_given () prompt_given ()
{ {
prompt="$1" 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