From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 18 Nov 2018 09:23:54 +0000 (+0900)
Subject: Merge branch 'ab/range-diff-no-patch'
X-Git-Tag: v2.20.0-rc0~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a5170794372cf1325710a3419473c91ec4af53bf?hp=--cc

Merge branch 'ab/range-diff-no-patch'

The "--no-patch" option, which can be used to get a high-level
overview without the actual line-by-line patch difference shown, of
the "range-diff" command was earlier broken, which has been
corrected.

* ab/range-diff-no-patch:
range-diff: make diff option behavior (e.g. --stat) consistent
range-diff: fix regression in passing along diff options
range-diff doc: add a section about output stability
---

a5170794372cf1325710a3419473c91ec4af53bf
diff --cc t/t3206-range-diff.sh
index 6aae364171,097ce34f84..e497c1358f
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@@ -122,40 -122,36 +122,70 @@@ test_expect_success 'changed commit' 
  	test_cmp expected actual
  '
  
+ test_expect_success 'changed commit with --no-patch diff option' '
+ 	git range-diff --no-color --no-patch topic...changed >actual &&
+ 	cat >expected <<-EOF &&
+ 	1:  4de457d = 1:  a4b3333 s/5/A/
+ 	2:  fccce22 = 2:  f51d370 s/4/A/
+ 	3:  147e64e ! 3:  0559556 s/11/B/
+ 	4:  a63e992 ! 4:  d966c5c s/12/B/
+ 	EOF
+ 	test_cmp expected actual
+ '
+ 
+ test_expect_success 'changed commit with --stat diff option' '
+ 	git range-diff --no-color --stat topic...changed >actual &&
+ 	cat >expected <<-EOF &&
+ 	1:  4de457d = 1:  a4b3333 s/5/A/
+ 	     a => b | 0
+ 	     1 file changed, 0 insertions(+), 0 deletions(-)
+ 	2:  fccce22 = 2:  f51d370 s/4/A/
+ 	     a => b | 0
+ 	     1 file changed, 0 insertions(+), 0 deletions(-)
+ 	3:  147e64e ! 3:  0559556 s/11/B/
+ 	     a => b | 0
+ 	     1 file changed, 0 insertions(+), 0 deletions(-)
+ 	4:  a63e992 ! 4:  d966c5c s/12/B/
+ 	     a => b | 0
+ 	     1 file changed, 0 insertions(+), 0 deletions(-)
+ 	EOF
+ 	test_cmp expected actual
+ '
+ 
 +test_expect_success 'changed commit with sm config' '
 +	git range-diff --no-color --submodule=log topic...changed >actual &&
 +	cat >expected <<-EOF &&
 +	1:  4de457d = 1:  a4b3333 s/5/A/
 +	2:  fccce22 = 2:  f51d370 s/4/A/
 +	3:  147e64e ! 3:  0559556 s/11/B/
 +	    @@ -10,7 +10,7 @@
 +	      9
 +	      10
 +	     -11
 +	    -+B
 +	    ++BB
 +	      12
 +	      13
 +	      14
 +	4:  a63e992 ! 4:  d966c5c s/12/B/
 +	    @@ -8,7 +8,7 @@
 +	     @@
 +	      9
 +	      10
 +	    - B
 +	    + BB
 +	     -12
 +	     +B
 +	      13
 +	EOF
 +	test_cmp expected actual
 +'
 +
 +test_expect_success 'no commits on one side' '
 +	git commit --amend -m "new message" &&
 +	git range-diff master HEAD@{1} HEAD
 +'
 +
  test_expect_success 'changed message' '
  	git range-diff --no-color topic...changed-message >actual &&
  	sed s/Z/\ /g >expected <<-EOF &&