Skip to content

Commit faf16d4

Browse files
sorganovgitster
authored andcommitted
t4013: test "git log -m --stat"
This is to ensure we won't break different diff formats when we start to imply "-p" by "-m". Signed-off-by: Sergey Organov <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 48229c1 commit faf16d4

File tree

2 files changed

+67
-0
lines changed

2 files changed

+67
-0
lines changed

t/t4013-diff-various.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ log -m -p master
338338
log --cc -m -p master
339339
log -c -m -p master
340340
log -m --raw master
341+
log -m --stat master
341342
log -SF master
342343
log -S F master
343344
log -SF -p master

t/t4013/diff.log_-m_--stat_master

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
$ git log -m --stat master
2+
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
3+
Merge: 9a6d494 c7a2ab9
4+
Author: A U Thor <[email protected]>
5+
Date: Mon Jun 26 00:04:00 2006 +0000
6+
7+
Merge branch 'side'
8+
9+
dir/sub | 2 ++
10+
file0 | 3 +++
11+
2 files changed, 5 insertions(+)
12+
13+
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a)
14+
Merge: 9a6d494 c7a2ab9
15+
Author: A U Thor <[email protected]>
16+
Date: Mon Jun 26 00:04:00 2006 +0000
17+
18+
Merge branch 'side'
19+
20+
dir/sub | 4 ++++
21+
file0 | 3 +++
22+
file1 | 3 +++
23+
file2 | 3 ---
24+
file3 | 4 ----
25+
5 files changed, 10 insertions(+), 7 deletions(-)
26+
27+
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
28+
Author: A U Thor <[email protected]>
29+
Date: Mon Jun 26 00:03:00 2006 +0000
30+
31+
Side
32+
33+
dir/sub | 2 ++
34+
file0 | 3 +++
35+
file3 | 4 ++++
36+
3 files changed, 9 insertions(+)
37+
38+
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
39+
Author: A U Thor <[email protected]>
40+
Date: Mon Jun 26 00:02:00 2006 +0000
41+
42+
Third
43+
44+
dir/sub | 2 ++
45+
file1 | 3 +++
46+
2 files changed, 5 insertions(+)
47+
48+
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
49+
Author: A U Thor <[email protected]>
50+
Date: Mon Jun 26 00:01:00 2006 +0000
51+
52+
Second
53+
54+
This is the second commit.
55+
56+
dir/sub | 2 ++
57+
file0 | 3 +++
58+
file2 | 3 ---
59+
3 files changed, 5 insertions(+), 3 deletions(-)
60+
61+
commit 444ac553ac7612cc88969031b02b3767fb8a353a
62+
Author: A U Thor <[email protected]>
63+
Date: Mon Jun 26 00:00:00 2006 +0000
64+
65+
Initial
66+
$

0 commit comments

Comments
 (0)