t/t4020-diff-external.sh

   1 #!/bin/sh
   2
   3 test_description='external diff interface test'
   4
   5 TEST_PASSES_SANITIZE_LEAK=true
   6 . ./test-lib.sh
   7
   8 test_expect_success setup '
   9
  10         test_tick &&
  11         echo initial >file &&
  12         git add file &&
  13         git commit -m initial &&
  14
  15         test_tick &&
  16         echo second >file &&
  17         before=$(git hash-object file) &&
  18         before=$(git rev-parse --short $before) &&
  19         git add file &&
  20         git commit -m second &&
  21
  22         test_tick &&
  23         echo third >file
  24 '
  25
  26 test_expect_success 'GIT_EXTERNAL_DIFF environment' '
  27         cat >expect <<-EOF &&
  28         file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
  29         EOF
  30         GIT_EXTERNAL_DIFF=echo git diff >out &&
  31         cut -d" " -f1,3- <out >actual &&
  32         test_cmp expect actual
  33
  34 '
  35
  36 test_expect_success 'GIT_EXTERNAL_DIFF environment should apply only to diff' '
  37         GIT_EXTERNAL_DIFF=echo git log -p -1 HEAD >out &&
  38         grep "^diff --git a/file b/file" out
  39
  40 '
  41
  42 test_expect_success 'GIT_EXTERNAL_DIFF environment and --no-ext-diff' '
  43         GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >out &&
  44         grep "^diff --git a/file b/file" out
  45
  46 '
  47
  48 test_expect_success SYMLINKS 'typechange diff' '
  49         rm -f file &&
  50         ln -s elif file &&
  51
  52         cat >expect <<-EOF &&
  53         file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 120000
  54         EOF
  55         GIT_EXTERNAL_DIFF=echo git diff >out &&
  56         cut -d" " -f1,3-4,6- <out >actual &&
  57         test_cmp expect actual &&
  58
  59         GIT_EXTERNAL_DIFF=echo git diff --no-ext-diff >actual &&
  60         git diff >expect &&
  61         test_cmp expect actual
  62 '
  63
  64 test_expect_success 'diff.external' '
  65         git reset --hard &&
  66         echo third >file &&
  67         test_config diff.external echo &&
  68
  69         cat >expect <<-EOF &&
  70         file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
  71         EOF
  72         git diff >out &&
  73         cut -d" " -f1,3-4,6- <out >actual &&
  74         test_cmp expect actual
  75 '
  76
  77 test_expect_success 'diff.external should apply only to diff' '
  78         test_config diff.external echo &&
  79         git log -p -1 HEAD >out &&
  80         grep "^diff --git a/file b/file" out
  81 '
  82
  83 test_expect_success 'diff.external and --no-ext-diff' '
  84         test_config diff.external echo &&
  85         git diff --no-ext-diff >out &&
  86         grep "^diff --git a/file b/file" out
  87 '
  88
  89 test_expect_success 'diff attribute' '
  90         git reset --hard &&
  91         echo third >file &&
  92
  93         git config diff.parrot.command echo &&
  94
  95         echo >.gitattributes "file diff=parrot" &&
  96
  97         cat >expect <<-EOF &&
  98         file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
  99         EOF
 100         git diff >out &&
 101         cut -d" " -f1,3-4,6- <out >actual &&
 102         test_cmp expect actual
 103 '
 104
 105 test_expect_success !SANITIZE_LEAK 'diff attribute should apply only to diff' '
 106         git log -p -1 HEAD >out &&
 107         grep "^diff --git a/file b/file" out
 108
 109 '
 110
 111 test_expect_success 'diff attribute and --no-ext-diff' '
 112         git diff --no-ext-diff >out &&
 113         grep "^diff --git a/file b/file" out
 114
 115 '
 116
 117 test_expect_success 'diff attribute' '
 118
 119         git config --unset diff.parrot.command &&
 120         git config diff.color.command echo &&
 121
 122         echo >.gitattributes "file diff=color" &&
 123
 124         cat >expect <<-EOF &&
 125         file $(git rev-parse --verify HEAD:file) 100644 $(test_oid zero) 100644
 126         EOF
 127         git diff >out &&
 128         cut -d" " -f1,3-4,6- <out >actual &&
 129         test_cmp expect actual
 130 '
 131
 132 test_expect_success !SANITIZE_LEAK 'diff attribute should apply only to diff' '
 133         git log -p -1 HEAD >out &&
 134         grep "^diff --git a/file b/file" out
 135
 136 '
 137
 138 test_expect_success 'diff attribute and --no-ext-diff' '
 139         git diff --no-ext-diff >out &&
 140         grep "^diff --git a/file b/file" out
 141
 142 '
 143
 144 test_expect_success 'GIT_EXTERNAL_DIFF trumps diff.external' '
 145         >.gitattributes &&
 146         test_config diff.external "echo ext-global" &&
 147
 148         cat >expect <<-EOF &&
 149         ext-env file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
 150         EOF
 151         GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
 152         cut -d" " -f1-2,4- <out >actual &&
 153         test_cmp expect actual
 154 '
 155
 156 test_expect_success 'attributes trump GIT_EXTERNAL_DIFF and diff.external' '
 157         test_config diff.foo.command "echo ext-attribute" &&
 158         test_config diff.external "echo ext-global" &&
 159         echo "file diff=foo" >.gitattributes &&
 160
 161         cat >expect <<-EOF &&
 162         ext-attribute file $(git rev-parse --verify HEAD:file) 100644 file $(test_oid zero) 100644
 163         EOF
 164         GIT_EXTERNAL_DIFF="echo ext-env" git diff >out &&
 165         cut -d" " -f1-2,4- <out >actual &&
 166         test_cmp expect actual
 167 '
 168
 169 test_expect_success 'no diff with -diff' '
 170         echo >.gitattributes "file -diff" &&
 171         git diff >out &&
 172         grep Binary out
 173 '
 174
 175 echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file
 176
 177 test_expect_success 'force diff with "diff"' '
 178         after=$(git hash-object file) &&
 179         after=$(git rev-parse --short $after) &&
 180         echo >.gitattributes "file diff" &&
 181         git diff >actual &&
 182         sed -e "s/^index .*/index $before..$after 100644/" \
 183                 "$TEST_DIRECTORY"/t4020/diff.NUL >expected-diff &&
 184         test_cmp expected-diff actual
 185 '
 186
 187 test_expect_success 'GIT_EXTERNAL_DIFF with more than one changed files' '
 188         echo anotherfile > file2 &&
 189         git add file2 &&
 190         git commit -m "added 2nd file" &&
 191         echo modified >file2 &&
 192         GIT_EXTERNAL_DIFF=echo git diff
 193 '
 194
 195 test_expect_success 'GIT_EXTERNAL_DIFF path counter/total' '
 196         write_script external-diff.sh <<-\EOF &&
 197         echo $GIT_DIFF_PATH_COUNTER of $GIT_DIFF_PATH_TOTAL >>counter.txt
 198         EOF
 199         >counter.txt &&
 200         cat >expect <<-\EOF &&
 201         1 of 2
 202         2 of 2
 203         EOF
 204         GIT_EXTERNAL_DIFF=./external-diff.sh git diff &&
 205         test_cmp expect counter.txt
 206 '
 207
 208 test_expect_success 'GIT_EXTERNAL_DIFF generates pretty paths' '
 209         test_when_finished "git rm -f file.ext" &&
 210         touch file.ext &&
 211         git add file.ext &&
 212         echo with extension > file.ext &&
 213
 214         cat >expect <<-EOF &&
 215         file.ext
 216         EOF
 217         GIT_EXTERNAL_DIFF=echo git diff file.ext >out &&
 218         basename $(cut -d" " -f2 <out) >actual &&
 219         test_cmp expect actual
 220 '
 221
 222 echo "#!$SHELL_PATH" >fake-diff.sh
 223 cat >> fake-diff.sh <<\EOF
 224 cat $2 >> crlfed.txt
 225 EOF
 226 chmod a+x fake-diff.sh
 227
 228 keep_only_cr () {
 229         tr -dc '\015'
 230 }
 231
 232 test_expect_success 'external diff with autocrlf = true' '
 233         test_config core.autocrlf true &&
 234         GIT_EXTERNAL_DIFF=./fake-diff.sh git diff &&
 235         test $(wc -l < crlfed.txt) = $(cat crlfed.txt | keep_only_cr | wc -c)
 236 '
 237
 238 test_expect_success 'diff --cached' '
 239         test_config core.autocrlf true &&
 240         git add file &&
 241         git update-index --assume-unchanged file &&
 242         echo second >file &&
 243         git diff --cached >actual &&
 244         test_cmp expected-diff actual
 245 '
 246
 247 test_expect_success 'clean up crlf leftovers' '
 248         git update-index --no-assume-unchanged file &&
 249         rm -f file* &&
 250         git reset --hard
 251 '
 252
 253 test_expect_success 'submodule diff' '
 254         git init sub &&
 255         ( cd sub && test_commit sub1 ) &&
 256         git add sub &&
 257         test_tick &&
 258         git commit -m "add submodule" &&
 259         ( cd sub && test_commit sub2 ) &&
 260         write_script gather_pre_post.sh <<-\EOF &&
 261         echo "$1 $4" # path, mode
 262         cat "$2" # old file
 263         cat "$5" # new file
 264         EOF
 265         GIT_EXTERNAL_DIFF=./gather_pre_post.sh git diff >actual &&
 266         cat >expected <<-EOF &&
 267         sub 160000
 268         Subproject commit $(git rev-parse HEAD:sub)
 269         Subproject commit $(cd sub && git rev-parse HEAD)
 270         EOF
 271         test_cmp expected actual
 272 '
 273
 274 test_done