From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Aug 2020 00:02:49 +0000 (-0700)
Subject: Merge branch 'so/log-diff-merges-opt'
X-Git-Tag: v2.29.0-rc0~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a555b514cd47f59b43f571eaff6b8cd7c01f0d11;p=thirdparty%2Fgit.git

Merge branch 'so/log-diff-merges-opt'

Earlier, to countermand the implicit "-m" option when the
"--first-parent" option is used with "git log", we added the
"--[no-]diff-merges" option in the jk/log-fp-implies-m topic.  To
leave the door open to allow the "--diff-merges" option to take
values that instructs how patches for merge commits should be
computed (e.g. "cc"? "-p against first parent?"), redefine
"--diff-merges" to take non-optional value, and implement "off"
that means the same thing as "--no-diff-merges".

* so/log-diff-merges-opt:
  t/t4013: add test for --diff-merges=off
  doc/git-log: describe --diff-merges=off
  revision: change "--diff-merges" option to require parameter
---

a555b514cd47f59b43f571eaff6b8cd7c01f0d11
diff --cc t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
index 0000000000,c878f13c95..194e893c94
mode 000000,100644..100644
--- a/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
+++ b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
@@@ -1,0 -1,78 +1,78 @@@
+ $ git log --diff-merges=off -p --first-parent master
+ commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
+ Merge: 9a6d494 c7a2ab9
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:04:00 2006 +0000
+ 
 -    Merge branch 'side' into master
++    Merge branch 'side'
+ 
+ commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:02:00 2006 +0000
+ 
+     Third
+ 
+ diff --git a/dir/sub b/dir/sub
+ index 8422d40..cead32e 100644
+ --- a/dir/sub
+ +++ b/dir/sub
+ @@ -2,3 +2,5 @@ A
+  B
+  C
+  D
+ +E
+ +F
+ diff --git a/file1 b/file1
+ new file mode 100644
+ index 0000000..b1e6722
+ --- /dev/null
+ +++ b/file1
+ @@ -0,0 +1,3 @@
+ +A
+ +B
+ +C
+ 
+ commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:01:00 2006 +0000
+ 
+     Second
+     
+     This is the second commit.
+ 
+ diff --git a/dir/sub b/dir/sub
+ index 35d242b..8422d40 100644
+ --- a/dir/sub
+ +++ b/dir/sub
+ @@ -1,2 +1,4 @@
+  A
+  B
+ +C
+ +D
+ diff --git a/file0 b/file0
+ index 01e79c3..b414108 100644
+ --- a/file0
+ +++ b/file0
+ @@ -1,3 +1,6 @@
+  1
+  2
+  3
+ +4
+ +5
+ +6
+ diff --git a/file2 b/file2
+ deleted file mode 100644
+ index 01e79c3..0000000
+ --- a/file2
+ +++ /dev/null
+ @@ -1,3 +0,0 @@
+ -1
+ -2
+ -3
+ 
+ commit 444ac553ac7612cc88969031b02b3767fb8a353a
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:00:00 2006 +0000
+ 
+     Initial
+ $
diff --cc t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
index 0000000000,ad2e6d3be2..5d7461a167
mode 000000,100644..100644
--- a/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
+++ b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
@@@ -1,0 -1,78 +1,78 @@@
+ $ git log --first-parent --diff-merges=off -p master
+ commit 80e25ffa65bcdbe82ef654b4d06dbbde7945c37f
+ Merge: 9a6d494 c7a2ab9
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:04:00 2006 +0000
+ 
 -    Merge branch 'side' into master
++    Merge branch 'side'
+ 
+ commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:02:00 2006 +0000
+ 
+     Third
+ 
+ diff --git a/dir/sub b/dir/sub
+ index 8422d40..cead32e 100644
+ --- a/dir/sub
+ +++ b/dir/sub
+ @@ -2,3 +2,5 @@ A
+  B
+  C
+  D
+ +E
+ +F
+ diff --git a/file1 b/file1
+ new file mode 100644
+ index 0000000..b1e6722
+ --- /dev/null
+ +++ b/file1
+ @@ -0,0 +1,3 @@
+ +A
+ +B
+ +C
+ 
+ commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:01:00 2006 +0000
+ 
+     Second
+     
+     This is the second commit.
+ 
+ diff --git a/dir/sub b/dir/sub
+ index 35d242b..8422d40 100644
+ --- a/dir/sub
+ +++ b/dir/sub
+ @@ -1,2 +1,4 @@
+  A
+  B
+ +C
+ +D
+ diff --git a/file0 b/file0
+ index 01e79c3..b414108 100644
+ --- a/file0
+ +++ b/file0
+ @@ -1,3 +1,6 @@
+  1
+  2
+  3
+ +4
+ +5
+ +6
+ diff --git a/file2 b/file2
+ deleted file mode 100644
+ index 01e79c3..0000000
+ --- a/file2
+ +++ /dev/null
+ @@ -1,3 +0,0 @@
+ -1
+ -2
+ -3
+ 
+ commit 444ac553ac7612cc88969031b02b3767fb8a353a
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:00:00 2006 +0000
+ 
+     Initial
+ $