Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin von Zweigbergk <martin.von.zweigbergk@gmail.com>2010-11-09 23:59:00 +0300
committerJunio C Hamano <gitster@pobox.com>2010-11-30 01:49:54 +0300
commit9474a029d5817a9a5a0f96cf257fa95befd93e62 (patch)
tree484cbfc6b3360f9aea3f9f5251e50d05681b064c /git-rebase.sh
parent593ce2bea5dad436e87b5dd37c205961d73feae9 (diff)
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>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index fb4fef7b1d..6ab95a33e9 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=