mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-01-26 17:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

t7610: add mergetool --gui tests

Browse Source 
In 063f2bdbf7 (mergetool: accept -g/--[no-]gui as arguments,
2018-10-24), mergetool was taught the --gui option but no tests were
added to ensure that it was working properly. Add a test to ensure that
it works.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Denton Liu 2019-04-24 15:46:59 -07:00 committed by Junio C Hamano
parent e9d309e2fc
commit 57d93c1d2c
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
t/t7610-mergetool.sh
View File

@ -145,6 +145,28 @@ test_expect_success 'custom mergetool' '
git commit -m "branch1 resolved with mergetool"
'
test_expect_success 'gui mergetool' '
test_config merge.guitool myguitool &&
test_config mergetool.myguitool.cmd "(printf \"gui \" && cat \"\$REMOTE\") >\"\$MERGED\"" &&
test_config mergetool.myguitool.trustExitCode true &&
test_when_finished "git reset --hard" &&
git checkout -b test$test_count branch1 &&
git submodule update -N &&
test_must_fail git merge master &&
( yes "" | git mergetool --gui both ) &&
( yes "" | git mergetool -g file1 file1 ) &&
( yes "" | git mergetool --gui file2 "spaced name" ) &&
( yes "" | git mergetool --gui subdir/file3 ) &&
( yes "d" | git mergetool --gui file11 ) &&
( yes "d" | git mergetool --gui file12 ) &&
( yes "l" | git mergetool --gui submod ) &&
test "$(cat file1)" = "gui master updated" &&
test "$(cat file2)" = "gui master new" &&
test "$(cat subdir/file3)" = "gui master new sub" &&
test "$(cat submod/bar)" = "branch1 submodule" &&
git commit -m "branch1 resolved with mergetool"
'
test_expect_success 'mergetool crlf' '
test_when_finished "git reset --hard" &&
# This test_config line must go after the above reset line so that