diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-22 22:36:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-22 22:36:28 +0300 |
| commit | 634e0084fac75cf85449a813da14968c9663a094 (patch) | |
| tree | 4954184348dd7032043726df7a2e622e97b52d46 /log-tree.c | |
| parent | bcb68bff80eab46f9d5f367555da803e61d3d7c8 (diff) | |
| parent | 07a7f8debfa43bd28537f475925776a92c30a678 (diff) | |
Merge branch 'es/format-patch-interdiff-cleanup'
"format-patch --range-diff=<prev> <origin>..HEAD" has been taught
not to ignore <origin> when <prev> is a single version.
* es/format-patch-interdiff-cleanup:
format-patch: use 'origin' as start of current-series-range when known
diff-lib: tighten show_interdiff()'s interface
diff: move show_interdiff() from its own file to diff-lib
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/log-tree.c b/log-tree.c index 8ac285a25a..cb8942fec1 100644 --- a/log-tree.c +++ b/log-tree.c @@ -15,7 +15,6 @@ #include "sequencer.h" #include "line-log.h" #include "help.h" -#include "interdiff.h" #include "range-diff.h" static struct decoration name_decoration = { "object names" }; @@ -800,7 +799,8 @@ void show_log(struct rev_info *opt) next_commentary_block(opt, NULL); fprintf_ln(opt->diffopt.file, "%s", opt->idiff_title); - show_interdiff(opt, 2); + show_interdiff(opt->idiff_oid1, opt->idiff_oid2, 2, + &opt->diffopt); memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff)); } |