Make difftool.prompt fall back to mergetool.prompt
PATCH 2/2 Make difftool.prompt fall back to mergetool.prompt
The documentation states that "git-difftool falls back to git-mergetool config variables when the difftool equivalents have not been defined". Until now, this was not the case for "difftool.prompt".
Signed-off-by Sebastian Schuberth <[email protected]>
--- git-difftool--helper.sh | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
git-difftool--helper.sh +4 -3
@@ -11,8 +11,9 @@ TOOL_MODE=diff # difftool.prompt controls the default prompt/no-prompt behavior # and is overridden with $GIT_DIFFTOOL*_PROMPT. -should_prompt () { - prompt=$(git config --bool difftool.prompt || echo true) +should_prompt_diff () { + local prompt_merge=$(should_prompt_merge && echo true || echo false) + local prompt=$(git config --bool difftool.prompt || echo $prompt_merge) if test "$prompt" = true; then test -z "$GIT_DIFFTOOL_NO_PROMPT" else
@@ -33,7 +34,7 @@ launch_merge_tool () { # $LOCAL and $REMOTE are temporary files so prompt # the user with the real $MERGED name before launching $merge_tool. - if should_prompt; then + if should_prompt_diff; then printf "\nViewing: '$MERGED'\n" printf "Hit return to launch '%s': " "$merge_tool" read ans
Signature · 1 line
1.6.5.1.1373.g71d1
The documentation states that "git-difftool falls back to git-mergetool config variables when the difftool equivalents have not been defined". Until now, this was not the case for "difftool.prompt".
Signed-off-by Sebastian Schuberth <[email protected]>
--- git-difftool--helper.sh | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
git-difftool--helper.sh +4 -3
@@ -11,8 +11,9 @@ TOOL_MODE=diff # difftool.prompt controls the default prompt/no-prompt behavior # and is overridden with $GIT_DIFFTOOL*_PROMPT. -should_prompt () { - prompt=$(git config --bool difftool.prompt || echo true) +should_prompt_diff () { + prompt_merge=$(should_prompt_merge && echo true || echo false) + prompt=$(git config --bool difftool.prompt || echo $prompt_merge) if test "$prompt" = true; then test -z "$GIT_DIFFTOOL_NO_PROMPT" else
@@ -33,7 +34,7 @@ launch_merge_tool () { # $LOCAL and $REMOTE are temporary files so prompt # the user with the real $MERGED name before launching $merge_tool. - if should_prompt; then + if should_prompt_diff; then printf "\nViewing: '$MERGED'\n" printf "Hit return to launch '%s': " "$merge_tool" read ans
Signature · 1 line
1.6.6.266.g55d982.dirty