[PATCH] git-difftool: allow skipping file by typing 'n' at prompt
- From
- Sitaram Chamarty <sitaram@atc.tcs.com>
- Date
- Oct 4, 2011, 10:53 UTC
- Message-ID
- <20111004105333.GA24331@atcmail.atc.tcs.com>
Signed-off-by: Sitaram Chamarty <sitaram@atc.tcs.com> ---
I'm using what is pretty much a universal convention to signify that the default choice is "y"; I hope documentation for something so small is not needed but if it is, let me know and I'll do that also.
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..bc1b098 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