diff options
| author | Jinoh Kang <luke1337@theori.io> | 2020-11-06 17:14:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-11 19:20:39 (GMT) |
| commit | d66851806ff25c6afdb4650d8292a50d5ca0ea6d (patch) | |
| tree | 45769e30dfdf55a9e0c3be38909f0df38ede4594 /t/t7800-difftool.sh | |
| parent | 246959346f3407cb047c3d46ed9c44da84bd0b29 (diff) | |
| download | git-d66851806ff25c6afdb4650d8292a50d5ca0ea6d.zip git-d66851806ff25c6afdb4650d8292a50d5ca0ea6d.tar.gz git-d66851806ff25c6afdb4650d8292a50d5ca0ea6d.tar.bz2 | |
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>
Diffstat (limited to 't/t7800-difftool.sh')
| -rwxr-xr-x | t/t7800-difftool.sh | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index e9391ab..a578b35 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -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' ' |