{"thread":{"id":"22348","subject":"[PATCH] t7800-difftool.sh: Test mergetool.prompt fallback","startedAt":"2010-01-23T05:58:00Z","lastAt":"2010-01-23T05:58:00Z","messageCount":1,"participants":["David Aguilar"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"132451","messageId":"1264226280-18888-1-git-send-email-davvid@gmail.com","threadId":"22348","inReplyTo":null,"subject":"[PATCH] t7800-difftool.sh: Test mergetool.prompt fallback","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2010-01-23T05:58:00Z","receivedAt":"2010-01-23T05:58:00Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"4cacc621 made difftool fall back to mergetool.prompt\nwhen difftool.prompt is unconfigured.  This adds a test.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\n t/t7800-difftool.sh |   12 ++++++++++++\n 1 files changed, 12 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh\nindex fad5472..a16bfa0 100755\n--- a/t/t7800-difftool.sh\n+++ b/t/t7800-difftool.sh\n@@ -27,6 +27,7 @@ remove_config_vars()\n \tgit config --unset difftool.prompt\n \tgit config --unset merge.tool\n \tgit config --unset mergetool.test-tool.cmd\n+\tgit config --unset mergetool.prompt\n \treturn 0\n }\n \n@@ -159,6 +160,17 @@ test_expect_success 'difftool.prompt config variable is false' '\n \trestore_test_defaults\n '\n \n+# Test that we don't have to pass --no-prompt when mergetool.prompt is false\n+test_expect_success 'difftool merge.promptconfig = false' '\n+\tgit config --unset difftool.prompt\n+\tgit config mergetool.prompt false &&\n+\n+\tdiff=$(git difftool branch) &&\n+\ttest \"$diff\" = \"branch\" &&\n+\n+\trestore_test_defaults\n+'\n+\n # Test that the -y flag can override difftool.prompt = true\n test_expect_success 'difftool.prompt can overridden with -y' '\n \tgit config difftool.prompt true &&\n-- \n1.6.6.1.436.gaba7d.dirty\n"}]}