diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2023-03-28 16:58:49 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-03-28 17:36:45 +0300 |
commit | 085390328f5fe1dfba67039b1fd6cc51546a4e41 (patch) | |
tree | d6db2e038ed3a08daa9def671f8c790d7589b495 /builtin | |
parent | ecb5091fd4301ac647db0bd2504112b38f7ee06d (diff) |
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')
-rw-r--r-- | builtin/log.c | 2 | ||||
-rw-r--r-- | builtin/rebase.c | 2 | ||||
-rw-r--r-- | builtin/stash.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/builtin/log.c b/builtin/log.c index f249aca049..b76a1c82d8 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1371,7 +1371,7 @@ static void make_cover_letter(struct rev_info *rev, int use_separate_file, .other_arg = &other_arg }; - diff_setup(&opts); + repo_diff_setup(the_repository, &opts); opts.file = rev->diffopt.file; opts.use_color = rev->diffopt.use_color; diff_setup_done(&opts); 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 |= diff --git a/builtin/stash.c b/builtin/stash.c index ed1275829e..6c062e5204 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -427,7 +427,7 @@ static void unstage_changes_unless_new(struct object_id *orig_tree) * to the index before a merge was run) and the current index * (reflecting the changes brought in by the merge). */ - diff_setup(&diff_opts); + repo_diff_setup(the_repository, &diff_opts); diff_opts.flags.recursive = 1; diff_opts.detect_rename = 0; diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT; |