From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Charles Bailey <charles@hashpling.org>,
Thomas Rast <trast@student.ethz.ch>
Subject: [PATCH 2/5] t7610-mergetool: add missing && and remove commented-out code
Date: Wed, 15 Oct 2014 01:35:18 -0700 [thread overview]
Message-ID: <1413362121-17361-2-git-send-email-davvid@gmail.com> (raw)
In-Reply-To: <1413362121-17361-1-git-send-email-davvid@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
---
t/t7610-mergetool.sh | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 875c8af..214edfb 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -192,7 +192,7 @@ test_expect_success 'mergetool merges all from subdir' '
test_expect_success 'mergetool skips resolved paths when rerere is active' '
git config rerere.enabled true &&
rm -rf .git/rr-cache &&
- git checkout -b test5 branch1
+ git checkout -b test5 branch1 &&
git submodule update -N &&
test_must_fail git merge master >/dev/null 2>&1 &&
( yes "l" | git mergetool --no-prompt submod >/dev/null 2>&1 ) &&
@@ -231,18 +231,12 @@ test_expect_success 'conflicted stash sets up rerere' '
'
test_expect_success 'mergetool takes partial path' '
- git reset --hard
+ git reset --hard &&
git config rerere.enabled false &&
git checkout -b test12 branch1 &&
git submodule update -N &&
test_must_fail git merge master &&
- #should not need these lines
- #( yes "d" | git mergetool file11 >/dev/null 2>&1 ) &&
- #( yes "d" | git mergetool file12 >/dev/null 2>&1 ) &&
- #( yes "l" | git mergetool submod >/dev/null 2>&1 ) &&
- #( yes "" | git mergetool file1 file2 >/dev/null 2>&1 ) &&
-
( yes "" | git mergetool subdir ) &&
test "$(cat subdir/file3)" = "master new sub" &&
--
2.1.2.453.g1b015e3
next prev parent reply other threads:[~2014-10-15 8:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-15 8:35 [PATCH 1/5] t7610-mergetool: use tabs instead of a mix of tabs and spaces David Aguilar
2014-10-15 8:35 ` David Aguilar [this message]
2014-10-15 8:35 ` [PATCH 3/5] t7610-mergetool: add test cases for mergetool.writeToTemp David Aguilar
2014-10-15 8:35 ` [PATCH 4/5] t7610-mergetool: prefer test_config over git config David Aguilar
2014-10-15 8:35 ` [PATCH 5/5] test-lib-functions: adjust style to match CodingGuidelines David Aguilar
2014-10-15 21:08 ` [PATCH 4/5] t7610-mergetool: prefer test_config over git config Junio C Hamano
2014-10-16 5:30 ` [PATCH v2 4/5] t7610-mergetool: use test_config to isolate tests David Aguilar
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=1413362121-17361-2-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@student.ethz.ch \
/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).