git-commit-vandalism/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master

$ git log --no-diff-merges -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'

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
$
revision: add "--no-diff-merges" option to counteract "-m" The "-m" option sets revs->ignore_merges to "0", but there's no way to undo it. This probably isn't something anybody overly cares about, since "1" is already the default, but it will serve as an escape hatch when we flip the default for ignore_merges to "0" in more situations. We'll also add a few extra niceties: - initialize the value to "-1" to indicate "not set", and then resolve it to the normal 0/1 bool in setup_revisions(). This lets any tweak functions, as well as setup_revisions() itself, avoid clobbering the user's preference (which until now they couldn't actually express). - since we now have --no-diff-merges, let's add the matching --diff-merges, which is just a synonym for "-m". Then we don't even need to document --no-diff-merges separately; it countermands the long form of "-m" in the usual way. The new test shows that this behaves just the same as the current behavior without "-m". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2020-07-29 22:10:20 +02:00			`$ git log --no-diff-merges -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 'jk/log-fp-implies-m' "git log --first-parent -p" showed patches only for single-parent commits on the first-parent chain; the "--first-parent" option has been made to imply "-m". Use "--no-diff-merges" to restore the previous behaviour to omit patches for merge commits. * jk/log-fp-implies-m: doc/git-log: clarify handling of merge commit diffs doc/git-log: move "-t" into diff-options list doc/git-log: drop "-r" diff option doc/git-log: move "Diff Formatting" from rev-list-options log: enable "-m" automatically with "--first-parent" revision: add "--no-diff-merges" option to counteract "-m" log: drop "--cc implies -m" logic 2020-08-18 02:02:49 +02:00			`Merge branch 'side'`
revision: add "--no-diff-merges" option to counteract "-m" The "-m" option sets revs->ignore_merges to "0", but there's no way to undo it. This probably isn't something anybody overly cares about, since "1" is already the default, but it will serve as an escape hatch when we flip the default for ignore_merges to "0" in more situations. We'll also add a few extra niceties: - initialize the value to "-1" to indicate "not set", and then resolve it to the normal 0/1 bool in setup_revisions(). This lets any tweak functions, as well as setup_revisions() itself, avoid clobbering the user's preference (which until now they couldn't actually express). - since we now have --no-diff-merges, let's add the matching --diff-merges, which is just a synonym for "-m". Then we don't even need to document --no-diff-merges separately; it countermands the long form of "-m" in the usual way. The new test shows that this behaves just the same as the current behavior without "-m". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2020-07-29 22:10:20 +02:00
			`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`
			`$`