Re: [PATCHv4 13/15] t7800 (difftool): add missing &&
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Oct 1, 2010, 11:30 UTC
- Message-ID
- <20101001113052.GG6816@burratino>
- In-Reply-To
- <1285542879-16381-14-git-send-email-newren@gmail.com>
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) &&