diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-22 05:57:14 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-14 14:27:04 -0700 |
| commit | 2e6fd71a52f5bde1c4036b8b0c586ae446f620f8 (patch) | |
| tree | f841048d434b7cbfa3fbe4e64d3c779bd27e8015 /builtin/log.c | |
| parent | format-patch: add --range-diff option to embed diff in cover letter (diff) | |
| download | git-2e6fd71a52f5bde1c4036b8b0c586ae446f620f8.tar.gz git-2e6fd71a52f5bde1c4036b8b0c586ae446f620f8.zip | |
format-patch: extend --range-diff to accept revision range
When submitting a revised a patch series, the --range-diff option embeds
a range-diff in the cover letter showing changes since the previous
version of the patch series. The argument to --range-diff is a simple
revision naming the tip of the previous series, which works fine if the
previous and current versions of the patch series share a common base.
However, it fails if the revision ranges of the old and new versions of
the series are disjoint. To address this shortcoming, extend
--range-diff to also accept an explicit revision range for the previous
series. For example:
git format-patch --cover-letter --range-diff=v1~3..v1 -3 v2
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 | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/builtin/log.c b/builtin/log.c index 4b65673f12..fa54090b02 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1448,12 +1448,21 @@ static const char *diff_title(struct strbuf *sb, int reroll_count, static void infer_range_diff_ranges(struct strbuf *r1, struct strbuf *r2, const char *prev, + struct commit *origin, struct commit *head) { const char *head_oid = oid_to_hex(&head->object.oid); - strbuf_addf(r1, "%s..%s", head_oid, prev); - strbuf_addf(r2, "%s..%s", prev, head_oid); + if (!strstr(prev, "..")) { + strbuf_addf(r1, "%s..%s", head_oid, prev); + strbuf_addf(r2, "%s..%s", prev, head_oid); + } else if (!origin) { + die(_("failed to infer range-diff ranges")); + } else { + strbuf_addstr(r1, prev); + strbuf_addf(r2, "%s..%s", + oid_to_hex(&origin->object.oid), head_oid); + } } int cmd_format_patch(int argc, const char **argv, const char *prefix) @@ -1802,7 +1811,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (!cover_letter) die(_("--range-diff requires --cover-letter")); - infer_range_diff_ranges(&rdiff1, &rdiff2, rdiff_prev, list[0]); + infer_range_diff_ranges(&rdiff1, &rdiff2, rdiff_prev, + origin, list[0]); rev.rdiff1 = rdiff1.buf; rev.rdiff2 = rdiff2.buf; rev.creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT; |