Pass empty file to p4merge where no base is suitable.
[git/debian.git] / t / t0021-conversion.sh
blob9078b84ae68b430285312749f62daee103dcc428
1 #!/bin/sh
3 test_description='blob conversion via gitattributes'
5 . ./test-lib.sh
7 cat <<EOF >rot13.sh
8 #!$SHELL_PATH
9 tr \
10 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' \
11 'nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM'
12 EOF
13 chmod +x rot13.sh
15 test_expect_success setup '
16 git config filter.rot13.smudge ./rot13.sh &&
17 git config filter.rot13.clean ./rot13.sh &&
20 echo "*.t filter=rot13"
21 echo "*.i ident"
22 } >.gitattributes &&
25 echo a b c d e f g h i j k l m
26 echo n o p q r s t u v w x y z
27 echo '\''$Id$'\''
28 } >test &&
29 cat test >test.t &&
30 cat test >test.o &&
31 cat test >test.i &&
32 git add test test.t test.i &&
33 rm -f test test.t test.i &&
34 git checkout -- test test.t test.i
37 script='s/^\$Id: \([0-9a-f]*\) \$/\1/p'
39 test_expect_success check '
41 cmp test.o test &&
42 cmp test.o test.t &&
44 # ident should be stripped in the repository
45 git diff --raw --exit-code :test :test.i &&
46 id=$(git rev-parse --verify :test) &&
47 embedded=$(sed -ne "$script" test.i) &&
48 test "z$id" = "z$embedded" &&
50 git cat-file blob :test.t > test.r &&
52 ./rot13.sh < test.o > test.t &&
53 cmp test.r test.t
56 # If an expanded ident ever gets into the repository, we want to make sure that
57 # it is collapsed before being expanded again on checkout
58 test_expect_success expanded_in_repo '
60 echo "File with expanded keywords"
61 echo "\$Id\$"
62 echo "\$Id:\$"
63 echo "\$Id: 0000000000000000000000000000000000000000 \$"
64 echo "\$Id: NoSpaceAtEnd\$"
65 echo "\$Id:NoSpaceAtFront \$"
66 echo "\$Id:NoSpaceAtEitherEnd\$"
67 echo "\$Id: NoTerminatingSymbol"
68 echo "\$Id: Foreign Commit With Spaces \$"
69 echo "\$Id: NoTerminatingSymbolAtEOF"
70 } > expanded-keywords &&
73 echo "File with expanded keywords"
74 echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$"
75 echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$"
76 echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$"
77 echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$"
78 echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$"
79 echo "\$Id: fd0478f5f1486f3d5177d4c3f6eb2765e8fc56b9 \$"
80 echo "\$Id: NoTerminatingSymbol"
81 echo "\$Id: Foreign Commit With Spaces \$"
82 echo "\$Id: NoTerminatingSymbolAtEOF"
83 } > expected-output &&
85 git add expanded-keywords &&
86 git commit -m "File with keywords expanded" &&
88 echo "expanded-keywords ident" >> .gitattributes &&
90 rm -f expanded-keywords &&
91 git checkout -- expanded-keywords &&
92 cat expanded-keywords &&
93 cmp expanded-keywords expected-output
96 # The use of %f in a filter definition is expanded to the path to
97 # the filename being smudged or cleaned. It must be shell escaped.
98 # First, set up some interesting file names and pet them in
99 # .gitattributes.
100 test_expect_success 'filter shell-escaped filenames' '
101 cat >argc.sh <<-EOF &&
102 #!$SHELL_PATH
103 cat >/dev/null
104 echo argc: \$# "\$@"
106 normal=name-no-magic &&
107 special="name with '\''sq'\'' and \$x" &&
108 echo some test text >"$normal" &&
109 echo some test text >"$special" &&
110 git add "$normal" "$special" &&
111 git commit -q -m "add files" &&
112 echo "name* filter=argc" >.gitattributes &&
114 # delete the files and check them out again, using a smudge filter
115 # that will count the args and echo the command-line back to us
116 git config filter.argc.smudge "sh ./argc.sh %f" &&
117 rm "$normal" "$special" &&
118 git checkout -- "$normal" "$special" &&
120 # make sure argc.sh counted the right number of args
121 echo "argc: 1 $normal" >expect &&
122 test_cmp expect "$normal" &&
123 echo "argc: 1 $special" >expect &&
124 test_cmp expect "$special" &&
126 # do the same thing, but with more args in the filter expression
127 git config filter.argc.smudge "sh ./argc.sh %f --my-extra-arg" &&
128 rm "$normal" "$special" &&
129 git checkout -- "$normal" "$special" &&
131 # make sure argc.sh counted the right number of args
132 echo "argc: 2 $normal --my-extra-arg" >expect &&
133 test_cmp expect "$normal" &&
134 echo "argc: 2 $special --my-extra-arg" >expect &&
135 test_cmp expect "$special" &&
139 test_done