t/t4013: add test for --diff-merges=off
Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Aug 6, 2020 at 01:08 UTC
298889d3e2053cf903b01fbac902cbfb210109ea
3 files changed
+158
t/t4013-diff-various.sh
+2
@@ -298,6 +298,8 @@ log --root -c --patch-with-stat --summary master
298
# improved by Timo's patch
299
log --root --cc --patch-with-stat --summary master
300
log --no-diff-merges -p --first-parent master
301
+log --diff-merges=off -p --first-parent master
302
+log --first-parent --diff-merges=off -p master
303
log -p --first-parent master
304
log -m -p --first-parent master
305
log -m -p master
t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
new
+78
@@ -0,0 +1,78 @@
1
+$ git log --diff-merges=off -p --first-parent master
2
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3
+Merge: 9a6d494 c7a2ab9
4
+Author: A U Thor <author@example.com>
5
+Date: Mon Jun 26 00:04:00 2006 +0000
6
+
7
+ Merge branch 'side' into master
8
+
9
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
10
+Author: A U Thor <author@example.com>
11
+Date: Mon Jun 26 00:02:00 2006 +0000
12
+
13
+ Third
14
+
15
+diff --git a/dir/sub b/dir/sub
16
+index 8422d40..cead32e 100644
17
+--- a/dir/sub
18
++++ b/dir/sub
19
+@@ -2,3 +2,5 @@ A
20
+ B
21
+ C
22
+ D
23
++E
24
++F
25
+diff --git a/file1 b/file1
26
+new file mode 100644
27
+index 0000000..b1e6722
28
+--- /dev/null
29
++++ b/file1
30
+@@ -0,0 +1,3 @@
31
++A
32
++B
33
++C
34
+
35
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
36
+Author: A U Thor <author@example.com>
37
+Date: Mon Jun 26 00:01:00 2006 +0000
38
+
39
+ Second
40
+
41
+ This is the second commit.
42
+
43
+diff --git a/dir/sub b/dir/sub
44
+index 35d242b..8422d40 100644
45
+--- a/dir/sub
46
++++ b/dir/sub
47
+@@ -1,2 +1,4 @@
48
+ A
49
+ B
50
++C
51
++D
52
+diff --git a/file0 b/file0
53
+index 01e79c3..b414108 100644
54
+--- a/file0
55
++++ b/file0
56
+@@ -1,3 +1,6 @@
57
+ 1
58
+ 2
59
+ 3
60
++4
61
++5
62
++6
63
+diff --git a/file2 b/file2
64
+deleted file mode 100644
65
+index 01e79c3..0000000
66
+--- a/file2
67
++++ /dev/null
68
+@@ -1,3 +0,0 @@
69
+-1
70
+-2
71
+-3
72
+
73
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
74
+Author: A U Thor <author@example.com>
75
+Date: Mon Jun 26 00:00:00 2006 +0000
76
+
77
+ Initial
78
+$
t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
new
+78
@@ -0,0 +1,78 @@
1
+$ git log --first-parent --diff-merges=off -p master
2
+commit 80e25ffa65bcdbe82ef654b4d06dbbde7945c37f
3
+Merge: 9a6d494 c7a2ab9
4
+Author: A U Thor <author@example.com>
5
+Date: Mon Jun 26 00:04:00 2006 +0000
6
+
7
+ Merge branch 'side' into master
8
+
9
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
10
+Author: A U Thor <author@example.com>
11
+Date: Mon Jun 26 00:02:00 2006 +0000
12
+
13
+ Third
14
+
15
+diff --git a/dir/sub b/dir/sub
16
+index 8422d40..cead32e 100644
17
+--- a/dir/sub
18
++++ b/dir/sub
19
+@@ -2,3 +2,5 @@ A
20
+ B
21
+ C
22
+ D
23
++E
24
++F
25
+diff --git a/file1 b/file1
26
+new file mode 100644
27
+index 0000000..b1e6722
28
+--- /dev/null
29
++++ b/file1
30
+@@ -0,0 +1,3 @@
31
++A
32
++B
33
++C
34
+
35
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
36
+Author: A U Thor <author@example.com>
37
+Date: Mon Jun 26 00:01:00 2006 +0000
38
+
39
+ Second
40
+
41
+ This is the second commit.
42
+
43
+diff --git a/dir/sub b/dir/sub
44
+index 35d242b..8422d40 100644
45
+--- a/dir/sub
46
++++ b/dir/sub
47
+@@ -1,2 +1,4 @@
48
+ A
49
+ B
50
++C
51
++D
52
+diff --git a/file0 b/file0
53
+index 01e79c3..b414108 100644
54
+--- a/file0
55
++++ b/file0
56
+@@ -1,3 +1,6 @@
57
+ 1
58
+ 2
59
+ 3
60
++4
61
++5
62
++6
63
+diff --git a/file2 b/file2
64
+deleted file mode 100644
65
+index 01e79c3..0000000
66
+--- a/file2
67
++++ /dev/null
68
+@@ -1,3 +0,0 @@
69
+-1
70
+-2
71
+-3
72
+
73
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
74
+Author: A U Thor <author@example.com>
75
+Date: Mon Jun 26 00:00:00 2006 +0000
76
+
77
+ Initial
78
+$