kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
David Aguilar 2014-10-15 01:35:18 -07:00 committed by Junio C Hamano
parent 74578618a0
commit 4756c05741
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t7610-mergetool.sh
View File

@ -192,7 +192,7 @@ test_expect_success 'mergetool merges all from subdir' '
test_expect_success 'mergetool skips resolved paths when rerere is active' ' test_expect_success 'mergetool skips resolved paths when rerere is active' '
git config rerere.enabled true && git config rerere.enabled true &&
rm -rf .git/rr-cache && rm -rf .git/rr-cache &&
git checkout -b test5 branch1 git checkout -b test5 branch1 &&
git submodule update -N && git submodule update -N &&
test_must_fail git merge master >/dev/null 2>&1 && test_must_fail git merge master >/dev/null 2>&1 &&
( yes "l" | git mergetool --no-prompt submod >/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' ' test_expect_success 'mergetool takes partial path' '
git reset --hard git reset --hard &&
git config rerere.enabled false && git config rerere.enabled false &&
git checkout -b test12 branch1 && git checkout -b test12 branch1 &&
git submodule update -N && git submodule update -N &&
test_must_fail git merge master && 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 ) && ( yes "" | git mergetool subdir ) &&


test "$(cat subdir/file3)" = "master new sub" && test "$(cat subdir/file3)" = "master new sub" &&