diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 22:53:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 22:53:56 +0200 |
| commit | 881c019ea6a0a45f97fb8a1865a88b07263a02ca (patch) | |
| tree | 1bbb5da82ce92a3ba85114ae641d8fcf62b8d7d6 /t/t3206-range-diff.sh | |
| parent | Merge branch 'es/format-patch-interdiff' (diff) | |
| parent | format-patch: allow --range-diff to apply to a lone-patch (diff) | |
| download | git-881c019ea6a0a45f97fb8a1865a88b07263a02ca.tar.xz git-881c019ea6a0a45f97fb8a1865a88b07263a02ca.zip | |
Merge branch 'es/format-patch-rangediff'
"git format-patch" learned a new "--range-diff" option to explain
the difference between this version and the previous attempt in
the cover letter (or after the tree-dashes as a comment).
* es/format-patch-rangediff:
format-patch: allow --range-diff to apply to a lone-patch
format-patch: add --creation-factor tweak for --range-diff
format-patch: teach --range-diff to respect -v/--reroll-count
format-patch: extend --range-diff to accept revision range
format-patch: add --range-diff option to embed diff in cover letter
range-diff: relieve callers of low-level configuration burden
range-diff: publish default creation factor
range-diff: respect diff_option.file rather than assuming 'stdout'
Diffstat (limited to 't/t3206-range-diff.sh')
| -rwxr-xr-x | t/t3206-range-diff.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index c94f9bf5ee..88ebed1dfa 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -181,4 +181,16 @@ test_expect_success 'dual-coloring' ' test_cmp expect actual ' +for prev in topic master..topic +do + test_expect_success "format-patch --range-diff=$prev" ' + git format-patch --stdout --cover-letter --range-diff=$prev \ + master..unmodified >actual && + grep "= 1: .* s/5/A" actual && + grep "= 2: .* s/4/A" actual && + grep "= 3: .* s/11/B" actual && + grep "= 4: .* s/12/B" actual + ' +done + test_done |