[PATCH v1 1/7] line-log: set patch format explicitly by default
From: Felipe Contreras <hidden>
Date: 2023-05-12 08:03:47
Subsystem:
the rest · Maintainer:
Linus Torvalds
Will help further changes. No functional changes. Signed-off-by: Felipe Contreras <redacted> --- builtin/log.c | 5 +++++ line-log.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/builtin/log.c b/builtin/log.c
index 676de107d6..712bfbf5c2 100644
--- a/builtin/log.c
+++ b/builtin/log.c@@ -890,6 +890,11 @@ int cmd_log(int argc, const char **argv, const char *prefix) opt.revarg_opt = REVARG_COMMITTISH; opt.tweak = log_setup_revisions_tweak; cmd_log_init(argc, argv, prefix, &rev, &opt); + + if (!rev.diffopt.output_format) + if (rev.line_level_traverse) + rev.diffopt.output_format = DIFF_FORMAT_PATCH; + return cmd_log_deinit(cmd_log_walk(&rev), &rev); }
diff --git a/line-log.c b/line-log.c
index 6a7ac312a4..7466366860 100644
--- a/line-log.c
+++ b/line-log.c@@ -1141,7 +1141,7 @@ int line_log_print(struct rev_info *rev, struct commit *commit) { show_log(rev); - if (!(rev->diffopt.output_format & DIFF_FORMAT_NO_OUTPUT)) { + if (rev->diffopt.output_format & DIFF_FORMAT_PATCH) { struct line_log_data *range = lookup_line_range(rev, commit); dump_diff_hacky(rev, range); }
--
2.40.0+fc1