summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2014-10-15 01:35:18 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-15 13:48:15 -0700
commit4756c05741164a0889212f1e8151ff081b75bba2 (patch)
tree8734a811be833562a572e3b1b1853f6bc1f1f16f /t/t7610-mergetool.sh
parent74578618a0b0d291d214779748edfbafdecb4ae3 (diff)
downloadgit-4756c05741164a0889212f1e8151ff081b75bba2.tar.gz
t7610-mergetool: add missing && and remove commented-out code
Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
-rwxr-xr-xt/t7610-mergetool.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 875c8af217..214edfbcfc 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" &&