From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [PATCHv3 14/16] t7800 (difftool): add missing &&
Date: Sat, 25 Sep 2010 13:07:05 -0600 [thread overview]
Message-ID: <1285441627-28233-15-git-send-email-newren@gmail.com> (raw)
In-Reply-To: <1285441627-28233-1-git-send-email-newren@gmail.com>
Also remove a call to 'git config --unset difftool.prompt', since that is
already unset by restore_test_defaults.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
t/t7800-difftool.sh | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 58dc6f6..ffb1960 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -98,7 +98,7 @@ test_expect_success PERL 'difftool --gui works without configured diff.guitool'
# Specify the diff tool using $GIT_DIFF_TOOL
test_expect_success PERL 'GIT_DIFF_TOOL variable' '
- git config --unset diff.tool
+ git config --unset diff.tool &&
GIT_DIFF_TOOL=test-tool &&
export GIT_DIFF_TOOL &&
@@ -166,7 +166,6 @@ 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' '
- git config --unset difftool.prompt
git config mergetool.prompt false &&
diff=$(git difftool branch) &&
@@ -211,7 +210,7 @@ test_expect_success PERL 'difftool last flag wins' '
# git-difftool falls back to git-mergetool config variables
# so test that behavior here
test_expect_success PERL 'difftool + mergetool config variables' '
- remove_config_vars
+ remove_config_vars &&
git config merge.tool test-tool &&
git config mergetool.test-tool.cmd "cat \$LOCAL" &&
@@ -254,17 +253,17 @@ test_expect_success PERL 'difftool -x cat' '
'
test_expect_success PERL 'difftool --extcmd echo arg1' '
- diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"echo\ \$1\" branch)
+ diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"echo\ \$1\" branch) &&
test "$diff" = file
'
test_expect_success PERL 'difftool --extcmd cat arg1' '
- diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$1\" branch)
+ diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$1\" branch) &&
test "$diff" = master
'
test_expect_success PERL 'difftool --extcmd cat arg2' '
- diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$2\" branch)
+ diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$2\" branch) &&
test "$diff" = branch
'
--
1.7.3.95.g14291
next prev parent reply other threads:[~2010-09-25 19:06 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-25 19:06 [PATCHv3 00/16] Add missing &&'s in the testsuite Elijah Newren
2010-09-25 19:06 ` [PATCHv3 01/16] t3020 (ls-files-error-unmatch): remove stray '1' from end of file Elijah Newren
2010-09-25 19:06 ` [PATCHv3 02/16] t4017 (diff-retval): replace manual exit code check with test_expect_code Elijah Newren
2010-09-25 19:06 ` [PATCHv3 03/16] t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing && Elijah Newren
2010-09-25 19:06 ` [PATCHv3 04/16] t4002 (diff-basic): use test_might_fail for commands that might fail Elijah Newren
2010-09-25 19:06 ` [PATCHv3 05/16] t4202 (log): Replace '<git-command> || :' with test_might_fail Elijah Newren
2010-09-25 19:06 ` [PATCHv3 06/16] t3600 (rm): add lots of missing && Elijah Newren
2010-09-25 19:06 ` [PATCHv3 07/16] t4019 (diff-wserror): " Elijah Newren
2010-09-25 19:06 ` [PATCHv3 08/16] t4026 (color): add " Elijah Newren
2010-09-26 3:38 ` Jeff King
2010-09-26 12:39 ` Elijah Newren
2010-09-25 19:07 ` [PATCHv3 09/16] t5602 (clone-remote-exec): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 10/16] t6016 (rev-list-graph-simplify-history): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 11/16] t6050 (replace): " Elijah Newren
2010-09-26 5:22 ` Christian Couder
2010-09-25 19:07 ` [PATCHv3 12/16] t7001 (mv): " Elijah Newren
2010-09-25 19:07 ` [PATCHv3 13/16] t7601 (merge-pull-config): " Elijah Newren
2010-09-25 19:07 ` Elijah Newren [this message]
2010-09-25 19:07 ` [PATCHv3 15/16] Add missing &&'s throughout the testsuite Elijah Newren
2010-09-25 19:38 ` Ævar Arnfjörð Bjarmason
2010-09-25 19:48 ` Elijah Newren
2010-09-25 19:07 ` [PATCHv3 16/16] Replace "unset VAR" with "unset VAR;" in testsuite as per t/README Elijah Newren
2010-09-25 19:39 ` [PATCHv3 00/16] Add missing &&'s in the testsuite Ævar Arnfjörð Bjarmason
2010-09-25 21:07 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285441627-28233-15-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).