Merge branch 'maint'

diff --git a/t/t7007-show.sh b/t/t7007-show.sh
index 1b824fe5ede3b933350696b78b6f53c1c69d0fff..42d3db624686998f49d2fb7c80b190eee14a3e9e 100755 (executable)
--- a/t/t7007-show.sh
+++ b/t/t7007-show.sh
@@ -124,4 +124,8 @@ test_expect_success '--quiet suppresses diff' '
        test_cmp expect actual
 '
 
+test_expect_success 'show --graph is forbidden' '
+  test_must_fail git show --graph HEAD
+'
+
 test_done