Merge branch 'nl/rebase-i-cheat-sheet' into maint

diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh
index b8eec8fd2646c15f289c2174eb5b25a532ded49d..ddd94976c25584d4f8dca4265f10be967d7db378 100755 (executable)
--- a/t/t4052-stat-output.sh
+++ b/t/t4052-stat-output.sh
@@ -290,9 +290,10 @@ EOF
 cat >expect1-graph <<'EOF'
 |  ...aaaaaaa | 1000 ++++++
 EOF
-while read teststate verb expect cmd args
+while read verb expect cmd args
 do
-       test_expect_$teststate "$cmd $verb prefix greater than COLUMNS (big change)" '
+       test_expect_success COLUMNS_CAN_BE_1 \
+               "$cmd $verb prefix greater than COLUMNS (big change)" '
                COLUMNS=1 git $cmd $args >output
                grep " | " output >actual &&
                test_cmp "$expect" actual
@@ -300,16 +301,17 @@ do
 
        test "$cmd" != diff || continue
 
-       test_expect_$teststate "$cmd --graph $verb prefix greater than COLUMNS (big change)" '
+       test_expect_success COLUMNS_CAN_BE_1 \
+               "$cmd --graph $verb prefix greater than COLUMNS (big change)" '
                COLUMNS=1 git $cmd $args --graph >output
                grep " | " output >actual &&
                test_cmp "$expect-graph" actual
        '
 done <<\EOF
-success ignores expect80 format-patch -1 --stdout
-failure respects expect1 diff HEAD^ HEAD --stat
-failure respects expect1 show --stat
-failure respects expect1 log -1 --stat
+ignores expect80 format-patch -1 --stdout
+respects expect1 diff HEAD^ HEAD --stat
+respects expect1 show --stat
+respects expect1 log -1 --stat
 EOF
 
 cat >expect <<'EOF'