X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3406-rebase-message.sh;h=85fc7c4af8cebdb50a7fa294b274bb2e7988997b;hb=7b1d6269eebb0701c287d3ed8732384c115d2e1f;hp=539108094345e3e0ba4cf03fc20a5ca6486fa230;hpb=1fbb58b4153e90eda08c2b022ee32d90729582e6;p=git.git diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index 539108094..85fc7c4af 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -22,7 +22,8 @@ test_expect_success setup ' git checkout topic && quick_one A && quick_one B && - quick_one Z + quick_one Z && + git tag start ' @@ -41,4 +42,24 @@ test_expect_success 'rebase -m' ' ' +test_expect_success 'rebase --stat' ' + git reset --hard start + git rebase --stat master >diffstat.txt && + grep "^ fileX | *1 +$" diffstat.txt +' + +test_expect_success 'rebase w/config rebase.stat' ' + git reset --hard start + git config rebase.stat true && + git rebase master >diffstat.txt && + grep "^ fileX | *1 +$" diffstat.txt +' + +test_expect_success 'rebase -n overrides config rebase.stat config' ' + git reset --hard start + git config rebase.stat true && + git rebase -n master >diffstat.txt && + ! grep "^ fileX | *1 +$" diffstat.txt +' + test_done