mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format-patch: allow --interdiff to apply to a lone-patch

Browse Source 
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>
This commit is contained in:
Eric Sunshine
2018-07-22 05:57:09 -04:00
committed by Junio C Hamano
parent 3fcc7a23a0
commit ee6cbf712e
4 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
log-tree.c
View File

@ -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)