t/t4030-diff-textconv.sh

   1 #!/bin/sh
   2
   3 test_description='diff.*.textconv tests'
   4 . ./test-lib.sh
   5
   6 find_diff() {
   7         sed '1,/^index /d' | sed '/^-- $/,$d'
   8 }
   9
  10 cat >expect.binary <<'EOF'
  11 Binary files a/file and b/file differ
  12 EOF
  13
  14 cat >expect.text <<'EOF'
  15 --- a/file
  16 +++ b/file
  17 @@ -1 +1,2 @@
  18  0
  19 +1
  20 EOF
  21
  22 cat >hexdump <<'EOF'
  23 #!/bin/sh
  24 perl -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1"
  25 EOF
  26 chmod +x hexdump
  27
  28 test_expect_success 'setup binary file with history' '
  29         printf "\\0\\n" >file &&
  30         git add file &&
  31         git commit -m one &&
  32         printf "\\01\\n" >>file &&
  33         git add file &&
  34         git commit -m two
  35 '
  36
  37 test_expect_success 'file is considered binary by porcelain' '
  38         git diff HEAD^ HEAD >diff &&
  39         find_diff <diff >actual &&
  40         test_cmp expect.binary actual
  41 '
  42
  43 test_expect_success 'file is considered binary by plumbing' '
  44         git diff-tree -p HEAD^ HEAD >diff &&
  45         find_diff <diff >actual &&
  46         test_cmp expect.binary actual
  47 '
  48
  49 test_expect_success 'setup textconv filters' '
  50         echo file diff=foo >.gitattributes &&
  51         git config diff.foo.textconv "\"$(pwd)\""/hexdump &&
  52         git config diff.fail.textconv false
  53 '
  54
  55 test_expect_success 'diff produces text' '
  56         git diff HEAD^ HEAD >diff &&
  57         find_diff <diff >actual &&
  58         test_cmp expect.text actual
  59 '
  60
  61 test_expect_success 'diff-tree produces binary' '
  62         git diff-tree -p HEAD^ HEAD >diff &&
  63         find_diff <diff >actual &&
  64         test_cmp expect.binary actual
  65 '
  66
  67 test_expect_success 'log produces text' '
  68         git log -1 -p >log &&
  69         find_diff <log >actual &&
  70         test_cmp expect.text actual
  71 '
  72
  73 test_expect_success 'format-patch produces binary' '
  74         git format-patch --no-binary --stdout HEAD^ >patch &&
  75         find_diff <patch >actual &&
  76         test_cmp expect.binary actual
  77 '
  78
  79 test_expect_success 'status -v produces text' '
  80         git reset --soft HEAD^ &&
  81         git status -v >diff &&
  82         find_diff <diff >actual &&
  83         test_cmp expect.text actual &&
  84         git reset --soft HEAD@{1}
  85 '
  86
  87 cat >expect.stat <<'EOF'
  88  file |  Bin 2 -> 4 bytes
  89  1 files changed, 0 insertions(+), 0 deletions(-)
  90 EOF
  91 test_expect_success 'diffstat does not run textconv' '
  92         echo file diff=fail >.gitattributes &&
  93         git diff --stat HEAD^ HEAD >actual &&
  94         test_cmp expect.stat actual
  95 '
  96 # restore working setup
  97 echo file diff=foo >.gitattributes
  98
  99 cat >expect.typechange <<'EOF'
 100 --- a/file
 101 +++ /dev/null
 102 @@ -1,2 +0,0 @@
 103 -0
 104 -1
 105 diff --git a/file b/file
 106 new file mode 120000
 107 index 0000000..67be421
 108 --- /dev/null
 109 +++ b/file
 110 @@ -0,0 +1 @@
 111 +frotz
 112 \ No newline at end of file
 113 EOF
 114 # make a symlink the hard way that works on symlink-challenged file systems
 115 test_expect_success 'textconv does not act on symlinks' '
 116         printf frotz > file &&
 117         git add file &&
 118         git ls-files -s | sed -e s/100644/120000/ |
 119                 git update-index --index-info &&
 120         git commit -m typechange &&
 121         git show >diff &&
 122         find_diff <diff >actual &&
 123         test_cmp expect.typechange actual
 124 '
 125
 126 test_done