Sergey Organov <sorganov@xxxxxxxxx> writes: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> Sergey Organov <sorganov@xxxxxxxxx> writes: >> >>> Junio C Hamano <gitster@xxxxxxxxx> writes: >>> >>> [...] >>> >>>> * jk/log-fp-implies-m (2020-07-29) 7 commits >>>> (merged to 'next' on 2020-08-03 at 39fefa6b82) >>>> + 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 >>>> >>>> Originally merged to 'next' on 2020-08-01 >>>> >>>> "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. >>>> >>>> On hold a bit. >>>> cf. <20200804200018.GB2014743@xxxxxxxxxxxxxxxxxxxxxxx> >>> >>> I believe I've submitted resolution for that. >>> >>> <20200805220832.3800-1-sorganov@xxxxxxxxx> >>> >>> Do you expect anything from me to push all this further? >> >> I was waiting for a reroll of the "resolution" with just one extra >> test I mentioned in <xmqq3650n2rc.fsf@xxxxxxxxxxxxxxxxxxxxxx> in the >> thread. With that everything would be good to go, I would think. Here is the patch you've asked for, separately, as I honestly believe it does not belong to the series in question themselves. This is on top of the series. -- >8 -- Subject: [PATCH] t/t4013: add permutation test for --diff-merges vs --first-parent Signed-off-by: Sergey Organov <sorganov@xxxxxxxxx> --- t/t4013-diff-various.sh | 1 + ...--first-parent_--diff-merges=off_-p_master | 78 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 86fb11cecc61..7f7f1058cb86 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -299,6 +299,7 @@ log --root -c --patch-with-stat --summary master log --root --cc --patch-with-stat --summary master log --no-diff-merges -p --first-parent master log --diff-merges=off -p --first-parent master +log --first-parent --diff-merges=off -p master log -p --first-parent master log -m -p --first-parent master log -m -p master diff --git a/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master new file mode 100644 index 000000000000..ad2e6d3be22c --- /dev/null +++ b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master @@ -0,0 +1,78 @@ +$ git log --first-parent --diff-merges=off -p master +commit 80e25ffa65bcdbe82ef654b4d06dbbde7945c37f +Merge: 9a6d494 c7a2ab9 +Author: A U Thor <author@xxxxxxxxxxx> +Date: Mon Jun 26 00:04:00 2006 +0000 + + Merge branch 'side' into master + +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 +Author: A U Thor <author@xxxxxxxxxxx> +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@xxxxxxxxxxx> +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@xxxxxxxxxxx> +Date: Mon Jun 26 00:00:00 2006 +0000 + + Initial +$ -- 2.20.1
