X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3406-rebase-message.sh;h=85fc7c4af8cebdb50a7fa294b274bb2e7988997b;hb=7b1d6269eebb0701c287d3ed8732384c115d2e1f;hp=332b2b2feb6441e4fe34fe234c3c873ffbd0c81a;hpb=f1a8cc635455a65567d040349327b9ea4adb479b;p=git.git

diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 332b2b2fe..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
 
 '
 
@@ -37,8 +38,28 @@ test_expect_success 'rebase -m' '
 	git rebase -m master >report &&
 	sed -n -e "/^Already applied: /p" \
 		-e "/^Committed: /p" report >actual &&
-	diff -u expect actual
+	test_cmp expect actual
 
 '
 
+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