format-patch: teach --interdiff to respect -v/--reroll-count
The --interdiff option introduces the embedded interdiff generically as "Interdiff:", however, we can do better when --reroll-count is specified by emitting "Interdiff against v{n}:" instead. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
Jul 22, 2018 at 05:57 UTC
5ac290f9c00edb8963585c322fae9fb06a98167d
3 files changed
+22
-1
builtin/log.c
+16
-1
@@ -1085,7 +1085,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
1085
show_diffstat(rev, origin, head);
1086
1087
if (rev->idiff_oid1) {
1088
- fprintf_ln(rev->diffopt.file, "%s", _("Interdiff:"));
1088
+ fprintf_ln(rev->diffopt.file, "%s", rev->idiff_title);
1089
show_interdiff(rev);
1090
}
1091
}
@@ -1427,6 +1427,16 @@ static void print_bases(struct base_tree_info *bases, FILE *file)
1427
oidclr(&bases->base_commit);
1428
}
1429
1430
+static const char *diff_title(struct strbuf *sb, int reroll_count,
1431
+ const char *generic, const char *rerolled)
1432
+{
1433
+ if (reroll_count <= 0)
1434
+ strbuf_addstr(sb, generic);
1435
+ else /* RFC may be v0, so allow -v1 to diff against v0 */
1436
+ strbuf_addf(sb, rerolled, reroll_count - 1);
1437
+ return sb->buf;
1438
+}
1439
+
1440
int cmd_format_patch(int argc, const char **argv, const char *prefix)
1441
{
1442
struct commit *commit;
@@ -1455,6 +1465,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
1465
int show_progress = 0;
1466
struct progress *progress = NULL;
1467
struct oid_array idiff_prev = OID_ARRAY_INIT;
1468
+ struct strbuf idiff_title = STRBUF_INIT;
1469
1470
const struct option builtin_format_patch_options[] = {
1471
{ OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
@@ -1758,6 +1769,9 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
1769
die(_("--interdiff requires --cover-letter"));
1770
rev.idiff_oid1 = &idiff_prev.oid[idiff_prev.nr - 1];
1771
rev.idiff_oid2 = get_commit_tree_oid(list[0]);
1772
+ rev.idiff_title = diff_title(&idiff_title, reroll_count,
1773
+ _("Interdiff:"),
1774
+ _("Interdiff against v%d:"));
1775
}
1776
1777
if (!signature) {
@@ -1880,6 +1894,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
1894
1895
done:
1896
oid_array_clear(&idiff_prev);
1897
+ strbuf_release(&idiff_title);
1898
return 0;
1899
}
1900
revision.h
+1
@@ -215,6 +215,7 @@ struct rev_info {
215
/* interdiff */
216
const struct object_id *idiff_oid1;
217
const struct object_id *idiff_oid2;
218
+ const char *idiff_title;
219
220
/* commit counts */
221
int count_left;
t/t4014-format-patch.sh
+5
@@ -1734,4 +1734,9 @@ test_expect_success 'interdiff: cover-letter' '
1734
test_cmp expect actual
1735
'
1736
1737
+test_expect_success 'interdiff: reroll-count' '
1738
+ git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop &&
1739
+ test_i18ngrep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch
1740
+'
1741
+
1742
test_done