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>

diff --git a/git-merge.sh b/git-merge.sh
index 7ebbce4bdbaf243a7a5612c024216b8ccf8eae44..351676f6d4a39c1ac682296781f4f5c8d1a3053d 100755 (executable)
--- 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 2dc2c4fe9b4d4a7ff10398938efbed28fa6f43f7..61770b5a2837b9d69ffb1db455f39ffdb3c8ea00 100755 (executable)
--- 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.