aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorTor Arne Vestbø <torarnv@gmail.com>2009-03-01 23:11:38 +0100
committerJunio C Hamano <gitster@pobox.com>2009-03-02 23:22:32 -0800
commita9c3821ca2fec065260b4314d61337a7529aba5b (patch)
treebd0a4c7fb22e9913c4713c44dff7b25c84c66828 /t
parentf474c526618d5d1111b585a6344e012fb731d3fe (diff)
downloadgit-a9c3821ca2fec065260b4314d61337a7529aba5b.tar.gz
git-a9c3821ca2fec065260b4314d61337a7529aba5b.tar.xz
git-rebase: Add --stat and --no-stat for producing diffstat on rebase
The behavior of --verbose is unchanged, but uses a different state variable internally, so that the meaning of verbose output may be expanded without affecting the diffstat. This is also reflected in the documentation. The configuration option rebase.stat works the same was as merg.stat, but the default is currently false. Signed-off-by: Tor Arne Vestbø <torarnv@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t3406-rebase-message.sh23
1 files changed, 22 insertions, 1 deletions
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