[PATCH] git-difftool: allow skipping file by typing 'n' at prompt
From: Sitaram Chamarty <hidden>
Date: 2016-06-15 22:52:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] git-difftool: allow skipping file by typing 'n' at prompt · Charles Bailey <hidden>
- 2016-06-15 · Re: [PATCH] git-difftool: allow skipping file by typing 'n' at prompt · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] git-difftool: allow skipping file by typing 'n' at prompt · Sitaram Chamarty <hidden>
- 2016-06-15 · Re: [PATCH] git-difftool: allow skipping file by typing 'n' at prompt · Junio C Hamano <hidden>
- 2016-06-15 · [PATCH] git-difftool: allow skipping file by typing 'n' at prompt · Sitaram Chamarty <hidden>
Signed-off-by: Sitaram Chamarty <redacted> --- (re-rolled according to earlier discussion) git-difftool--helper.sh | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 8452890..0468446 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh@@ -38,15 +38,16 @@ launch_merge_tool () { # $LOCAL and $REMOTE are temporary files so prompt # the user with the real $MERGED name before launching $merge_tool. + ans=y if should_prompt then printf "\nViewing: '$MERGED'\n" if use_ext_cmd then - printf "Hit return to launch '%s': " \ + printf "Launch '%s' [Y/n]: " \ "$GIT_DIFFTOOL_EXTCMD" else - printf "Hit return to launch '%s': " "$merge_tool" + printf "Launch '%s' [Y/n]: " "$merge_tool" fi read ans fi
@@ -54,9 +55,9 @@ launch_merge_tool () { if use_ext_cmd then export BASE - eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"' + test "$ans" != "n" && eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"' else - run_merge_tool "$merge_tool" + test "$ans" != "n" && run_merge_tool "$merge_tool" fi }
--
1.7.6