blob: aad6c7f78db34703b2f9b1ed72239cd3b4005016 [file] [log] [blame]
Jeff Kingdf5e91f2008-10-26 00:42:25 -04001#!/bin/sh
2
3test_description='diff.*.textconv tests'
4. ./test-lib.sh
5
6find_diff() {
7 sed '1,/^index /d' | sed '/^-- $/,$d'
8}
9
10cat >expect.binary <<'EOF'
11Binary files a/file and b/file differ
12EOF
13
14cat >expect.text <<'EOF'
15--- a/file
16+++ b/file
17@@ -1 +1,2 @@
18 0
19+1
20EOF
21
22cat >hexdump <<'EOF'
23#!/bin/sh
Junio C Hamano7096b642012-06-12 09:49:59 -070024"$PERL_PATH" -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1"
Jeff Kingdf5e91f2008-10-26 00:42:25 -040025EOF
26chmod +x hexdump
27
28test_expect_success 'setup binary file with history' '
29 printf "\\0\\n" >file &&
30 git add file &&
31 git commit -m one &&
Johannes Sixtdeb13872008-12-02 09:31:01 +010032 printf "\\01\\n" >>file &&
Jeff Kingdf5e91f2008-10-26 00:42:25 -040033 git add file &&
34 git commit -m two
35'
36
37test_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
43test_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
49test_expect_success 'setup textconv filters' '
50 echo file diff=foo >.gitattributes &&
Johannes Sixt63962582010-01-01 23:15:18 +010051 git config diff.foo.textconv "\"$(pwd)\""/hexdump &&
Jeff Kingdf5e91f2008-10-26 00:42:25 -040052 git config diff.fail.textconv false
53'
54
Jeff King04427ac2008-10-26 00:44:53 -040055test_expect_success 'diff produces text' '
Jeff Kingdf5e91f2008-10-26 00:42:25 -040056 git diff HEAD^ HEAD >diff &&
57 find_diff <diff >actual &&
58 test_cmp expect.text actual
59'
60
Michael J Gruber4bd52d02013-05-10 17:10:10 +020061test_expect_success 'show commit produces text' '
62 git show HEAD >diff &&
63 find_diff <diff >actual &&
64 test_cmp expect.text actual
65'
66
Jeff Kingdf5e91f2008-10-26 00:42:25 -040067test_expect_success 'diff-tree produces binary' '
68 git diff-tree -p HEAD^ HEAD >diff &&
69 find_diff <diff >actual &&
70 test_cmp expect.binary actual
71'
72
Jeff King04427ac2008-10-26 00:44:53 -040073test_expect_success 'log produces text' '
Jeff Kingdf5e91f2008-10-26 00:42:25 -040074 git log -1 -p >log &&
75 find_diff <log >actual &&
76 test_cmp expect.text actual
77'
78
Jeff Kingc7534ef2008-10-26 00:45:55 -040079test_expect_success 'format-patch produces binary' '
Jeff Kingdf5e91f2008-10-26 00:42:25 -040080 git format-patch --no-binary --stdout HEAD^ >patch &&
81 find_diff <patch >actual &&
82 test_cmp expect.binary actual
83'
84
Jeff Kinga79b8b62008-10-26 00:50:02 -040085test_expect_success 'status -v produces text' '
86 git reset --soft HEAD^ &&
87 git status -v >diff &&
88 find_diff <diff >actual &&
89 test_cmp expect.text actual &&
90 git reset --soft HEAD@{1}
91'
92
Michael J Gruber4bd52d02013-05-10 17:10:10 +020093test_expect_success 'show blob produces binary' '
94 git show HEAD:file >actual &&
95 printf "\\0\\n\\01\\n" >expect &&
96 test_cmp expect actual
97'
98
Michael J Gruber083b9932013-05-10 17:10:12 +020099test_expect_success 'show --textconv blob produces text' '
Michael J Gruber4bd52d02013-05-10 17:10:10 +0200100 git show --textconv HEAD:file >actual &&
101 printf "0\\n1\\n" >expect &&
102 test_cmp expect actual
103'
104
Michael J Gruber083b9932013-05-10 17:10:12 +0200105test_expect_success 'show --no-textconv blob produces binary' '
106 git show --no-textconv HEAD:file >actual &&
Michael J Gruber4bd52d02013-05-10 17:10:10 +0200107 printf "\\0\\n\\01\\n" >expect &&
108 test_cmp expect actual
109'
110
Jeff Kingb1c2f572012-10-28 07:40:00 -0400111test_expect_success 'grep-diff (-G) operates on textconv data (add)' '
112 echo one >expect &&
113 git log --root --format=%s -G0 >actual &&
114 test_cmp expect actual
115'
116
117test_expect_success 'grep-diff (-G) operates on textconv data (modification)' '
118 echo two >expect &&
119 git log --root --format=%s -G1 >actual &&
120 test_cmp expect actual
121'
122
Jeff Kingef90ab62012-10-28 08:27:12 -0400123test_expect_success 'pickaxe (-S) operates on textconv data (add)' '
124 echo one >expect &&
125 git log --root --format=%s -S0 >actual &&
126 test_cmp expect actual
127'
128
129test_expect_success 'pickaxe (-S) operates on textconv data (modification)' '
130 echo two >expect &&
131 git log --root --format=%s -S1 >actual &&
132 test_cmp expect actual
133'
134
Jeff Kingdf5e91f2008-10-26 00:42:25 -0400135cat >expect.stat <<'EOF'
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +0200136 file | Bin 2 -> 4 bytes
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +0700137 1 file changed, 0 insertions(+), 0 deletions(-)
Jeff Kingdf5e91f2008-10-26 00:42:25 -0400138EOF
Jeff King04427ac2008-10-26 00:44:53 -0400139test_expect_success 'diffstat does not run textconv' '
Jeff Kingdf5e91f2008-10-26 00:42:25 -0400140 echo file diff=fail >.gitattributes &&
141 git diff --stat HEAD^ HEAD >actual &&
Jonathan Nieder6dd88832012-03-13 00:05:54 -0500142 test_i18ncmp expect.stat actual &&
143
144 head -n1 <expect.stat >expect.line1 &&
145 head -n1 <actual >actual.line1 &&
146 test_cmp expect.line1 actual.line1
Jeff Kingdf5e91f2008-10-26 00:42:25 -0400147'
148# restore working setup
149echo file diff=foo >.gitattributes
150
151cat >expect.typechange <<'EOF'
152--- a/file
153+++ /dev/null
154@@ -1,2 +0,0 @@
155-0
156-1
157diff --git a/file b/file
158new file mode 120000
Junio C Hamano90b23e52009-01-27 01:08:02 -0800159index 0000000..67be421
Jeff Kingdf5e91f2008-10-26 00:42:25 -0400160--- /dev/null
161+++ b/file
162@@ -0,0 +1 @@
163+frotz
164\ No newline at end of file
165EOF
Johannes Sixt889c6f02013-06-07 22:53:28 +0200166
Jeff King26757732008-10-26 00:46:21 -0400167test_expect_success 'textconv does not act on symlinks' '
Johannes Sixt889c6f02013-06-07 22:53:28 +0200168 rm -f file &&
169 test_ln_s_add frotz file &&
Jeff Kingdf5e91f2008-10-26 00:42:25 -0400170 git commit -m typechange &&
171 git show >diff &&
172 find_diff <diff >actual &&
173 test_cmp expect.typechange actual
174'
175
176test_done