aboutsummaryrefslogtreecommitdiff
path: root/builtin/rebase.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2023-03-28 15:58:49 +0200
committerJunio C Hamano <gitster@pobox.com>2023-03-28 07:36:45 -0700
commit085390328f5fe1dfba67039b1fd6cc51546a4e41 (patch)
treed6db2e038ed3a08daa9def671f8c790d7589b495 /builtin/rebase.c
parentecb5091fd4301ac647db0bd2504112b38f7ee06d (diff)
downloadgit-085390328f5fe1dfba67039b1fd6cc51546a4e41.tar.xz
cocci: apply the "diff.h" part of "the_repository.pending"
Apply the part of "the_repository.pending.cocci" pertaining to "diff.h". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase.c')
-rw-r--r--builtin/rebase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index eba48bffaa..76cce94373 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1786,7 +1786,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
}
/* We want color (if set), but no pager */
- diff_setup(&opts);
+ repo_diff_setup(the_repository, &opts);
opts.stat_width = -1; /* use full terminal width */
opts.stat_graph_width = -1; /* respect statGraphWidth config */
opts.output_format |=