This is uglier than a simple
touch "$GIT_EXEC_PATH/use-builtin-difftool"
of course. But oh well.
Signed-off-by: Johannes Schindelin <[email protected]>
---
This patch implements the good ole' cross-validation technique
(also known as "GitHub Scientist") that I already used for my
rebase--helper work.
I am not sure whether we want to have that patch in `master`,
ever. But at least for the transition time, it may make sense.
t/t7800-difftool.sh | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index e94910c563..273ab55723 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -23,6 +23,20 @@ prompt_given ()
test "$prompt" = "Launch 'test-tool' [Y/n]? branch"
}
+for use_builtin_difftool in false true
+do
+
+test_expect_success 'verify we are running the correct difftool' '
+ if test true = '$use_builtin_difftool'
+ then
+ test_must_fail ok=129 git difftool -h >help &&
+ grep "g, --gui" help
+ else
+ git difftool -h >help &&
+ grep "g|--gui" help
+ fi
+'
+
# NEEDSWORK: lose all the PERL prereqs once legacy-difftool is retired.
# Create a file on master and change it on branch
@@ -606,4 +620,17 @@ test_expect_success PERL,SYMLINKS 'difftool --dir-diff
symlinked directories' '
)
'
+test true != $use_builtin_difftool || break
+
+test_expect_success 'tear down for re-run' '
+ rm -rf * .[a-z]* &&
+ git init
+'
+
+# run as builtin difftool now
+GIT_CONFIG_PARAMETERS="'difftool.usebuiltin=true'"
+export GIT_CONFIG_PARAMETERS
+
+done
+
test_done
--
2.11.0.rc3.windows.1
