Merge branch 'maint'

diff --git a/builtin/diff.c b/builtin/diff.c
index 81b6baec7472ff34c8ee5c9630f697f9897bd747..9069dc41be33a362ff04d52c00b4830eed272826 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -285,8 +285,9 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        /* Otherwise, we are doing the usual "git" diff */
        rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;
 
-       /* Scale to real terminal size */
+       /* Scale to real terminal size and respect statGraphWidth config */
        rev.diffopt.stat_width = -1;
+       rev.diffopt.stat_graph_width = -1;
 
        /* Default to let external and textconv be used */
        DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
@@ -326,7 +327,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                                add_head_to_pending(&rev);
                                if (!rev.pending.nr) {
                                        struct tree *tree;
-                                       tree = lookup_tree((const unsigned char*)EMPTY_TREE_SHA1_BIN);
+                                       tree = lookup_tree(EMPTY_TREE_SHA1_BIN);
                                        add_pending_object(&rev, &tree->object, "HEAD");
                                }
                                break;