Jeff King schrieb: > This patch moves the text conversion to a > diff_filespec_textconv function; this function can be called > to insert the text-converted contents of the file into the > filespec. These contents will survive through any > diff_populate_filespec calls, meaning that it is safe to > pass the resulting filespec to other diff functions which > will look at the content. What do we do when symlinks are involved? Pilot error? Or should we exclude them from textconv (and diff.*.command, for that matter) at all times? See a test case below. > Also, I'm happy to hear comments on which functionality should get > text-converted. I think I like seeing the --stat report the binary > changes. At this time I also think that it is enough to apply textconv only to generate diffs. Test case follows: diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index e456746..dab4338 100755 --- a/t/t4030-diff-textconv.sh +++ b/t/t4030-diff-textconv.sh @@ -19,6 +19,18 @@ cat >expect.text <<'EOF' +1 EOF +cat >expect.typechange <<'EOF' +Binary files a/file and /dev/null differ +diff --git a/file b/file +new file mode 120000 +index ad8b3d2..67be421 +--- /dev/null ++++ b/file +@@ -0,0 +1 @@ ++frotz +\ No newline at end of file +EOF + cat >hexdump <<'EOF' #!/bin/sh perl -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' "$1" @@ -75,4 +87,16 @@ test_expect_success 'format-patch produces binary' ' test_cmp expect.binary actual ' +# make a symlink the hard way that works on symlink-challenged file systems +test_expect_failure 'textconv does not kick in if there is a type change' ' + echo -n frotz > file && + git add file && + git ls-files -s | sed -e s/100644/120000/ | + git update-index --index-info && + git commit -m typechange && + git show >diff && + find_diff <diff >actual && + test_cmp expect.typechange actual +' + test_done -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
