@@ -457,6 +457,17 @@ diff-tree --stat --compact-summary initial mode
diff-tree -R --stat --compact-summary initial mode
EOF
+# This should succeed as --patch followed by --no-patch sequence is to
+# be a no-op according to the manual page. In reality it breaks --raw
+# though. Needs to be fixed.
+test_expect_failure '--no-patch cancels --patch only' '
+ git log --raw master >result &&
+ process_diffs result >expected &&
+ git log --patch --no-patch --raw >result &&
+ process_diffs result >actual &&
+ test_cmp expected actual
+'
+
test_expect_success 'log -m matches pure log' '
git log master >result &&
process_diffs result >expected &&