We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 94eaa80 commit fcfec8bCopy full SHA for fcfec8b
t/t7800-difftool.sh
@@ -434,4 +434,18 @@ test_expect_success PERL 'difftool --no-symlinks detects conflict ' '
434
)
435
'
436
437
+test_expect_success PERL 'difftool properly honors gitlink and core.worktree' '
438
+ git submodule add ./. submod/ule &&
439
+ (
440
+ cd submod/ule &&
441
+ test_config diff.tool checktrees &&
442
+ test_config difftool.checktrees.cmd '\''
443
+ test -d "$LOCAL" && test -d "$REMOTE" && echo good
444
+ '\'' &&
445
+ echo good >expect &&
446
+ git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
447
+ test_cmp expect actual
448
+ )
449
+'
450
+
451
test_done
0 commit comments