Merge branch 'jc/diff-test'

* jc/diff-test:
t4013: add "diff" UI program tests.

diff --combined t/t4013-diff-various.sh
index 026832761f9a2cc3436a083ac9f28b2d9deebd49,1d2f7f9f7d6b914cdaa4ee2cecc3b5155924729e..06837d1c7c053e9b4a97f120754fec22c50b2bd3
--- 1/t/t4013-diff-various.sh
--- 2/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@@ -138,10 -138,7 +138,10 @@@ diff-tree --pretty --summary initia
  diff-tree --pretty --stat --summary initial
  diff-tree --pretty --root -p initial
  diff-tree --pretty --root --stat initial
 -#diff-tree --pretty --root --summary initial
 +# improved by Timo's patch
 +diff-tree --pretty --root --summary initial
 +# improved by Timo's patch
 +diff-tree --pretty --root --summary -r initial
  diff-tree --pretty --root --stat --summary initial
  diff-tree --pretty --patch-with-stat initial
  diff-tree --pretty --root --patch-with-stat initial
@@@ -153,7 -150,6 +153,7 @@@ diff-tree --pretty=oneline --root initi
  diff-tree --pretty=oneline -p initial
  diff-tree --pretty=oneline --root -p initial
  diff-tree --pretty=oneline --patch-with-stat initial
 +# improved by Timo's patch
  diff-tree --pretty=oneline --root --patch-with-stat initial
  diff-tree --pretty=oneline --patch-with-raw initial
  diff-tree --pretty=oneline --root --patch-with-raw initial
@@@ -176,9 -172,11 +176,9 @@@ diff-tree --cc --stat --summary maste
  # stat summary should show the diffstat and summary with the first parent
  diff-tree -c --stat --summary side
  diff-tree --cc --stat --summary side
 -# this one gives an extra newline after stat, which should be removed
 -# diff-tree --cc --patch-with-stat master
 -# this one gives an extra newline after stat, which should be removed
 -# other than that it shows the correct example -- stat and summary are
 -# against the first parent, and patch-looking combined diff follows.
 +# improved by Timo's patch
 +diff-tree --cc --patch-with-stat master
 +# improved by Timo's patch
  diff-tree --cc --patch-with-stat --summary master
  # this is correct
  diff-tree --cc --patch-with-stat --summary side
@@@ -190,9 -188,7 +190,9 @@@ log --root -p maste
  log --patch-with-stat master
  log --root --patch-with-stat master
  log --root --patch-with-stat --summary master
 +# improved by Timo's patch
  log --root -c --patch-with-stat --summary master
 +# improved by Timo's patch
  log --root --cc --patch-with-stat --summary master
  log -SF master
  log -SF -p master
@@@ -204,9 -200,7 +204,9 @@@ whatchanged --root -p maste
  whatchanged --patch-with-stat master
  whatchanged --root --patch-with-stat master
  whatchanged --root --patch-with-stat --summary master
 +# improved by Timo's patch
  whatchanged --root -c --patch-with-stat --summary master
 +# improved by Timo's patch
  whatchanged --root --cc --patch-with-stat --summary master
  whatchanged -SF master
  whatchanged -SF -p master
@@@ -233,6 -227,15 +233,15 @@@ format-patch --attach --stdout initial.
  format-patch --attach --stdout initial..master^
  format-patch --attach --stdout initial..master
  
+ diff --abbrev initial..side
+ diff -r initial..side
+ diff --stat initial..side
+ diff -r --stat initial..side
+ diff initial..side
+ diff --patch-with-stat initial..side
+ diff --patch-with-raw initial..side
+ diff --patch-with-stat -r initial..side
+ diff --patch-with-raw -r initial..side
  EOF
  
  test_done