t4013: test "git log -m --raw"
This is to ensure we won't break different diff formats when we start to imply "-p" by "-m". Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
May 21, 2021 at 00:46 UTC
48229c193d2e6e728d3243bacea2f1e1490ced8a
2 files changed
+62
t/t4013-diff-various.sh
+1
@@ -337,6 +337,7 @@ log -m -p --first-parent master
337
log -m -p master
338
log --cc -m -p master
339
log -c -m -p master
340
+log -m --raw master
341
log -SF master
342
log -S F master
343
log -SF -p master
t/t4013/diff.log_-m_--raw_master
new
+61
@@ -0,0 +1,61 @@
1
+$ git log -m --raw master
2
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
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'
8
+
9
+:100644 100644 cead32e... 992913c... M dir/sub
10
+:100644 100644 b414108... 10a8a9f... M file0
11
+
12
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a)
13
+Merge: 9a6d494 c7a2ab9
14
+Author: A U Thor <author@example.com>
15
+Date: Mon Jun 26 00:04:00 2006 +0000
16
+
17
+ Merge branch 'side'
18
+
19
+:100644 100644 7289e35... 992913c... M dir/sub
20
+:100644 100644 f4615da... 10a8a9f... M file0
21
+:000000 100644 0000000... b1e6722... A file1
22
+:100644 000000 01e79c3... 0000000... D file2
23
+:100644 000000 7289e35... 0000000... D file3
24
+
25
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
26
+Author: A U Thor <author@example.com>
27
+Date: Mon Jun 26 00:03:00 2006 +0000
28
+
29
+ Side
30
+
31
+:100644 100644 35d242b... 7289e35... M dir/sub
32
+:100644 100644 01e79c3... f4615da... M file0
33
+:000000 100644 0000000... 7289e35... A file3
34
+
35
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
36
+Author: A U Thor <author@example.com>
37
+Date: Mon Jun 26 00:02:00 2006 +0000
38
+
39
+ Third
40
+
41
+:100644 100644 8422d40... cead32e... M dir/sub
42
+:000000 100644 0000000... b1e6722... A file1
43
+
44
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
45
+Author: A U Thor <author@example.com>
46
+Date: Mon Jun 26 00:01:00 2006 +0000
47
+
48
+ Second
49
+
50
+ This is the second commit.
51
+
52
+:100644 100644 35d242b... 8422d40... M dir/sub
53
+:100644 100644 01e79c3... b414108... M file0
54
+:100644 000000 01e79c3... 0000000... D file2
55
+
56
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
57
+Author: A U Thor <author@example.com>
58
+Date: Mon Jun 26 00:00:00 2006 +0000
59
+
60
+ Initial
61
+$