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

t7800: simplify difftool test 

The new test added by the previous commit can be simplified a lot.
Let's do so.

Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jinoh Kang <luke1337@theori.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jinoh Kang 2020-11-06 17:14:52 +00:00 committed by Junio C Hamano
parent 246959346f
commit d66851806f
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
t/t7800-difftool.sh
View File

@ -730,25 +730,15 @@ test_expect_success 'add -N and difftool -d' '

test_expect_success 'difftool --cached with unmerged files' '
test_when_finished git reset --hard &&
echo base >file &&
git add file &&
git commit -m base &&
git checkout -B conflict-a &&
git checkout -B conflict-b &&
git checkout conflict-a &&
echo conflict-a >>file &&
git add file &&
git commit -m conflict-a &&
git checkout conflict-b &&
echo conflict-b >>file &&
git add file &&
git commit -m conflict-b &&
git checkout master &&
git merge conflict-a &&
test_must_fail git merge conflict-b &&
: >expect &&
git difftool --cached --no-prompt >actual &&
test_cmp expect actual

test_commit conflicting &&
test_commit conflict-a conflict.t a &&
git reset --hard conflicting &&
test_commit conflict-b conflict.t b &&
test_must_fail git merge conflict-a &&

git difftool --cached --no-prompt >output &&
test_must_be_empty output
'

test_expect_success 'outside worktree' '