John Keeping <j...@keeping.me.uk> writes:
> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
> index 3aab6e1..70e09b6 100755
> --- a/t/t7800-difftool.sh
> +++ b/t/t7800-difftool.sh
> @@ -340,6 +340,28 @@ test_expect_success PERL 'difftool --dir-diff' '
> stdin_contains file <output
> '
>
> +write_script .git/CHECK_SYMLINKS <<\EOF
> +for f in file file2 sub/sub
> +do
> + echo "$f"
> + readlink "$2/$f"
> +done >actual
> +EOF
When you later want to enhance the test to check a combination of
difftool arguments where some paths are expected to become links and
others are expected to become real files, wouldn't this helper
become a bit awkward to use? The element that expects a real file
could be an empty line to what corresponds to the output from
readlink, but still...
If t/ directory (or when the test is run with --root=<there>) is
aliased with symlinks in such a way that "cd <there> && $(pwd)" does
not match <there>, would this check with $(pwd) still work, I have
to wonder?
> +test_expect_success PERL,SYMLINKS 'difftool --dir-diff --symlink without
> unstaged changes' '
> + cat <<EOF >expect &&
> +file
> +$(pwd)/file
> +file2
> +$(pwd)/file2
> +sub/sub
> +$(pwd)/sub/sub
> +EOF
You can do this to align them nicer (note the "-" before EOF):
cat >expect <<-EOF &&
file
$(pwd)/file
...
EOF
> + git difftool --dir-diff --symlink \
> + --extcmd "./.git/CHECK_SYMLINKS" branch HEAD &&
> + test_cmp actual expect
> +'
> +
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
