summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2018-07-22 09:57:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-23 19:50:06 (GMT)
commitee6cbf712edcbd1dc14993ab2452fbe882dc524a (patch)
treec339d324037e1a3de90b91385b4c8a7fad1cfde7 /log-tree.c
parent3fcc7a23a0b76bdac07b605a6afd6084ac543821 (diff)
downloadgit-ee6cbf712edcbd1dc14993ab2452fbe882dc524a.zip
git-ee6cbf712edcbd1dc14993ab2452fbe882dc524a.tar.gz
git-ee6cbf712edcbd1dc14993ab2452fbe882dc524a.tar.bz2
format-patch: allow --interdiff to apply to a lone-patch
When submitting a revised version of a patch or series, it can be helpful (to reviewers) to include a summary of changes since the previous attempt in the form of an interdiff, typically in the cover letter. However, it is occasionally useful, despite making for a noisy read, to insert an interdiff into the commentary section of the lone patch of a 1-patch series. Therefore, extend "git format-patch --interdiff=<prev>" to insert an interdiff into the commentary section of a lone patch rather than requiring a cover letter. The interdiff is indented to avoid confusing git-am and human readers into considering it part of the patch proper. Implementation note: Generating an interdiff for insertion into the commentary section of a patch which itself is currently being generated requires invoking the diffing machinery recursively. However, the machinery does not (presently) support this since it uses global state. Consequently, we need to take care to stash away the state of the in-progress operation while generating the interdiff, and restore it after. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c
index 9d38f1c..56513fa 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -14,6 +14,7 @@
#include "sequencer.h"
#include "line-log.h"
#include "help.h"
+#include "interdiff.h"
static struct decoration name_decoration = { "object names" };
static int decoration_loaded;
@@ -736,6 +737,19 @@ void show_log(struct rev_info *opt)
strbuf_release(&msgbuf);
free(ctx.notes_message);
+
+ if (cmit_fmt_is_mail(ctx.fmt) && opt->idiff_oid1) {
+ struct diff_queue_struct dq;
+
+ memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff));
+ DIFF_QUEUE_CLEAR(&diff_queued_diff);
+
+ next_commentary_block(opt, NULL);
+ fprintf_ln(opt->diffopt.file, "%s", opt->idiff_title);
+ show_interdiff(opt, 2);
+
+ memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff));
+ }
}
int log_tree_diff_flush(struct rev_info *opt)