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 /t | |
| parent | format-patch: add --range-diff option to embed diff in cover letter (diff) | |
| download | tgif-2e6fd71a52f5bde1c4036b8b0c586ae446f620f8.tar.xz | |
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 't')
| -rwxr-xr-x | t/t3206-range-diff.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index dd854b6ebc..3d7a2d8a4d 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -142,7 +142,7 @@ test_expect_success 'changed message' ' test_cmp expected actual ' -for prev in topic +for prev in topic master..topic do test_expect_success "format-patch --range-diff=$prev" ' git format-patch --stdout --cover-letter --range-diff=$prev \ |