Re: [PATCHv4 13/15] t7800 (difftool): add missing &&
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:49:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
Elijah Newren wrote:
Also remove a call to 'git config --unset difftool.prompt', since that is already unset by restore_test_defaults.
Isn't the restore_test_defaults call at the end of the previous test? It might not be reached. How about this?
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index c45abf3..4048d10 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh@@ -166,6 +166,7 @@ test_expect_success PERL 'difftool.prompt config variable is false' ' # Test that we don't have to pass --no-prompt when mergetool.prompt is false test_expect_success PERL 'difftool merge.prompt = false' ' + test_might_fail git config --unset difftool.prompt && git config mergetool.prompt false && diff=$(git difftool branch) &&
--