diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-22 05:57:07 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-23 12:50:06 -0700 |
| commit | 3b026417eaa1f32f53b85d1b131194ae1cbbf068 (patch) | |
| tree | 88021090ad5695a6497243778afdc12d437b9007 /builtin/log.c | |
| parent | format-patch: teach --interdiff to respect -v/--reroll-count (diff) | |
| download | git-3b026417eaa1f32f53b85d1b131194ae1cbbf068.tar.gz git-3b026417eaa1f32f53b85d1b131194ae1cbbf068.zip | |
interdiff: teach show_interdiff() to indent interdiff
A future change will allow "git format-patch --interdiff=<prev> -1" to
insert an interdiff into the commentary section of the lone patch of a
1-patch series. However, to prevent the inserted interdiff from
confusing git-am, as well as human readers, it needs to be indented.
Therefore, teach show_interdiff() how to indent.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 99ddfe8bb0..8078a43d14 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1086,7 +1086,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, if (rev->idiff_oid1) { fprintf_ln(rev->diffopt.file, "%s", rev->idiff_title); - show_interdiff(rev); + show_interdiff(rev, 0); } } |