diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-22 09:57:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-23 19:50:06 (GMT) |
| commit | 5ac290f9c00edb8963585c322fae9fb06a98167d (patch) | |
| tree | df27551cf485fa788794bd019f7729655a842716 /t | |
| parent | 126facf8219177bc265be725a8579c86ebdf99a5 (diff) | |
| download | git-5ac290f9c00edb8963585c322fae9fb06a98167d.zip git-5ac290f9c00edb8963585c322fae9fb06a98167d.tar.gz git-5ac290f9c00edb8963585c322fae9fb06a98167d.tar.bz2 | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4014-format-patch.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 57b4632..5950890 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -1734,4 +1734,9 @@ test_expect_success 'interdiff: cover-letter' ' test_cmp expect actual ' +test_expect_success 'interdiff: reroll-count' ' + git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop && + test_i18ngrep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch +' + test_done |