From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Tue, 9 Nov 2010 20:59:00 +0000 (+0100)
Subject: rebase: only show stat if configured to true
X-Git-Tag: v1.7.3.4~14^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9474a029d5817a9a5a0f96cf257fa95befd93e62;p=git.git

rebase: only show stat if configured to true

If rebase.stat is set to true, a diffstat should be displayed. If it is
not set, it should default to false. However, if it is explicitly set to
false (or other value), a diffstat is still displayed, which is probably
not what most users would expect. Show diffstat only if it is set
to true.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase.sh b/git-rebase.sh
index fb4fef7b1..6ab95a33e 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -48,7 +48,8 @@ do_merge=
 dotest="$GIT_DIR"/rebase-merge
 prec=4
 verbose=
-diffstat=$(git config --bool rebase.stat)
+diffstat=
+test "$(git config --bool rebase.stat)" = true && diffstat=t
 git_am_opt=
 rebase_root=
 force_rebase=