diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-12-04 12:49:50 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-04 12:49:50 +0900 |
| commit | 965798d1f2992a4bdadb81eba195a7d465b6454a (patch) | |
| tree | 6924453fd098ad4f980cf8d34ef5f9ab9625c6c5 /t | |
| parent | Merge branch 'en/rebase-consistency' (diff) | |
| parent | range-diff: always pass at least minimal diff options (diff) | |
| download | tgif-965798d1f2992a4bdadb81eba195a7d465b6454a.tar.xz | |
Merge branch 'es/format-patch-range-diff-fix-fix'
* es/format-patch-range-diff-fix-fix:
range-diff: always pass at least minimal diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3206-range-diff.sh | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index e497c1358f..048feaf6dd 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -248,18 +248,24 @@ test_expect_success 'dual-coloring' ' for prev in topic master..topic do test_expect_success "format-patch --range-diff=$prev" ' - git format-patch --stdout --cover-letter --range-diff=$prev \ + git format-patch --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 + test_when_finished "rm 000?-*" && + test_line_count = 5 actual && + test_i18ngrep "^Range-diff:$" 0000-* && + grep "= 1: .* s/5/A" 0000-* && + grep "= 2: .* s/4/A" 0000-* && + grep "= 3: .* s/11/B" 0000-* && + grep "= 4: .* s/12/B" 0000-* ' done test_expect_success 'format-patch --range-diff as commentary' ' - git format-patch --stdout --range-diff=HEAD~1 HEAD~1 >actual && - test_i18ngrep "^Range-diff:$" actual + git format-patch --range-diff=HEAD~1 HEAD~1 >actual && + test_when_finished "rm 0001-*" && + test_line_count = 1 actual && + test_i18ngrep "^Range-diff:$" 0001-* && + grep "> 1: .* new message" 0001-* ' test_done |