rebase: implement --[no-]autostash and rebase.autostash

diff --git a/t/t9002-column.sh b/t/t9002-column.sh
index fb71949ebd1f52b64ae82e22987e51385bb6400a..89983527b62f1d6c330edaf2f50c70ce735b0c1e 100755 (executable)
--- a/t/t9002-column.sh
+++ b/t/t9002-column.sh
@@ -90,6 +90,30 @@ EOF
        test_cmp expected actual
 '
 
+test_expect_success '20 columns, nodense' '
+       cat >expected <<\EOF &&
+one    seven
+two    eight
+three  nine
+four   ten
+five   eleven
+six
+EOF
+       git column --mode=column,nodense < lista > actual &&
+       test_cmp expected actual
+'
+
+test_expect_success '20 columns, dense' '
+       cat >expected <<\EOF &&
+one   five  nine
+two   six   ten
+three seven eleven
+four  eight
+EOF
+       git column --mode=column,dense < lista > actual &&
+       test_cmp expected actual
+'
+
 test_expect_success '20 columns, padding 2' '
        cat >expected <<\EOF &&
 one     seven
@@ -129,4 +153,28 @@ EOF
        test_cmp expected actual
 '
 
+test_expect_success '20 columns, row first, nodense' '
+       cat >expected <<\EOF &&
+one    two
+three  four
+five   six
+seven  eight
+nine   ten
+eleven
+EOF
+       git column --mode=row,nodense <lista >actual &&
+       test_cmp expected actual
+'
+
+test_expect_success '20 columns, row first, dense' '
+       cat >expected <<\EOF &&
+one   two    three
+four  five   six
+seven eight  nine
+ten   eleven
+EOF
+       git column --mode=row,dense <lista >actual &&
+       test_cmp expected actual
+'
+
 test_done