Merge branch 'sb/merge-recursive-copy-paste-fix'

diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 805b055c899e7c9f5653eb740572f67417c9dcb6..6ec607211803d2685b109b7fc0d926d206bbf1d4 100755 (executable)
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -324,4 +324,14 @@ test_expect_success 'diff --cached -- file on unborn branch' '
        test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result
 '
 
+test_expect_success 'diff-tree --stdin with log formatting' '
+       cat >expect <<-\EOF &&
+       Side
+       Third
+       Second
+       EOF
+       git rev-list master | git diff-tree --stdin --format=%s -s >actual &&
+       test_cmp expect actual
+'
+
 test_done