1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
#!/bin/sh
. libtest.sh
. libgit.sh
export LINES=47
tigrc <<EOF
set split-view-height = 37
set vertical-split = no
set main-view = id commit-title:yes,graph=no,refs=no,overflow=no
EOF
steps '
:enter
:save-display main-submodule.screen
:set diff-options = --submodule
:save-display main-submodule-diff.screen
'
test_setup_work_dir()
{
git_clone 'repo-two' .
git submodule init
git submodule update
}
test_tig
assert_equals 'main-submodule.screen' <<EOF
feeb2df [repo-two] Integrate feature from repo-two-a, repo-two-b, repo-two-c
7f9d74d [repo-two] Integrate feature from repo-two-b
2bbde7f [repo-two] Integrate feature from repo-two-a, repo-two-c
3a2603a [repo-two] Creating repository
9bb0f0d [repo-two] Commit 2
4f3cb50 [repo-two] Commit 1
a9db5c5 [repo-two] Commit 0
[main] feeb2dfd5e09e887e4b6c901e7d91a4c85a7831d - commit 1 of 7 100%
commit feeb2dfd5e09e887e4b6c901e7d91a4c85a7831d
Refs: [master], {origin/master}, {origin/HEAD}
Author: A. U. Thor <a.u.thor@example.com>
AuthorDate: Sun Sep 6 08:23:30 2009 +0000
Commit: Committer <c.ommitter@example.net>
CommitDate: Sun Sep 6 08:23:30 2009 +0000
[repo-two] Integrate feature from repo-two-a, repo-two-b, repo-two-c
---
repo-two-a | 2 +-
repo-two-b | 2 +-
repo-two-c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/repo-two-a b/repo-two-a
index a1d2fa2..598d4e4 160000
--- a/repo-two-a
+++ b/repo-two-a
@@ -1 +1 @@
-Subproject commit a1d2fa223a5f983adaad9a22df5c518aefba1d07
+Subproject commit 598d4e4d8b652f28e7b78fd4f95124fadb10efcf
diff --git a/repo-two-b b/repo-two-b
index f3866fb..8ab92f1 160000
--- a/repo-two-b
+++ b/repo-two-b
@@ -1 +1 @@
-Subproject commit f3866fb983d82c8fc2b01423dde37084f59385d5
+Subproject commit 8ab92f1f22470039668eb12d405e4356dcae8305
diff --git a/repo-two-c b/repo-two-c
index cd41885..e4b7821 160000
--- a/repo-two-c
+++ b/repo-two-c
@@ -1 +1 @@
-Subproject commit cd41885fa2b86fa6aae5308bba55c76a97498dcc
+Subproject commit e4b78219ea174bc0c7f97024cf18fc1e6c08013a
[diff] feeb2dfd5e09e887e4b6c901e7d91a4c85a7831d - line 1 of 35 100%
EOF
assert_equals 'main-submodule-diff.screen' <<EOF
feeb2df [repo-two] Integrate feature from repo-two-a, repo-two-b, repo-two-c
7f9d74d [repo-two] Integrate feature from repo-two-b
2bbde7f [repo-two] Integrate feature from repo-two-a, repo-two-c
3a2603a [repo-two] Creating repository
9bb0f0d [repo-two] Commit 2
4f3cb50 [repo-two] Commit 1
a9db5c5 [repo-two] Commit 0
[main] feeb2dfd5e09e887e4b6c901e7d91a4c85a7831d - commit 1 of 7 100%
commit feeb2dfd5e09e887e4b6c901e7d91a4c85a7831d
Refs: [master], {origin/master}, {origin/HEAD}
Author: A. U. Thor <a.u.thor@example.com>
AuthorDate: Sun Sep 6 08:23:30 2009 +0000
Commit: Committer <c.ommitter@example.net>
CommitDate: Sun Sep 6 08:23:30 2009 +0000
[repo-two] Integrate feature from repo-two-a, repo-two-b, repo-two-c
---
repo-two-a | 2 +-
repo-two-b | 2 +-
repo-two-c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Submodule repo-two-a a1d2fa2..598d4e4:
> [repo-two-a] Commit 5
Submodule repo-two-b f3866fb..8ab92f1:
> [repo-two-b] Commit 5
Submodule repo-two-c cd41885..e4b7821:
> [repo-two-c] Commit 5
[diff] feeb2dfd5e09e887e4b6c901e7d91a4c85a7831d - line 1 of 20 100%
EOF
|
