Merge branch 'ds/reachable'

diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index c94f9bf5ee12c1db38764ac6e51bbc011d3a2619..d481f2925924317a44f1bba65e6ca41fc57cc65d 100755 (executable)
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -181,4 +181,21 @@ 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_expect_success 'format-patch --range-diff as commentary' '
+       git format-patch --stdout --range-diff=HEAD~1 HEAD~1 >actual &&
+       test_i18ngrep "^Range-diff:$" actual
+'
+
 test_done