From fefe49d134b4dadf3a184ba7a8e48388f3c15a24 Mon Sep 17 00:00:00 2001
From: James Bowes <jbowes@dangerouslyinc.com>
Date: Sat, 5 May 2007 16:48:54 -0400
Subject: [PATCH] Add colour support in rebase and merge tree diff stats
output.
The rebase and merge commands used diff-tree to display the summary stats of
what files had changed from the operation. diff-tree does not read the
diff ui configuration options, so the diff.color setting was not used.
Have rebase and merge call diff rather than diff-tree, which does read the
diff ui options.
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
git-merge.sh | 3 ++-
git-rebase.sh | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/git-merge.sh b/git-merge.sh
index 7ebbce4bdb..351676f6d4 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -90,7 +90,8 @@ finish () {
?*)
case "$no_summary" in
'')
- git-diff-tree --stat --summary -M "$head" "$1"
+ # We want color (if set), but no pager
+ GIT_PAGER='' git-diff --stat --summary -M "$head" "$1"
;;
esac
;;
diff --git a/git-rebase.sh b/git-rebase.sh
index 2dc2c4fe9b..61770b5a28 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -307,7 +307,8 @@ fi
if test -n "$verbose"
then
echo "Changes from $mb to $onto:"
- git-diff-tree --stat --summary "$mb" "$onto"
+ # We want color (if set), but no pager
+ GIT_PAGER='' git-diff --stat --summary "$mb" "$onto"
fi
# Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.