@@ -82,16 +82,16 @@ test_expect_success 'test basic "submodule foreach" usage' '
82
82
83
83
cat > expect << EOF
84
84
Entering '../sub1'
85
- $pwd /clone-foo1-sub1-$sub1sha1
85
+ $pwd /clone-foo1-sub1-../sub1- $sub1sha1
86
86
Entering '../sub3'
87
- $pwd /clone-foo3-sub3-$sub3sha1
87
+ $pwd /clone-foo3-sub3-../sub3- $sub3sha1
88
88
EOF
89
89
90
90
test_expect_success ' test "submodule foreach" from subdirectory' '
91
91
mkdir clone/sub &&
92
92
(
93
93
cd clone/sub &&
94
- git submodule foreach "echo \$toplevel-\$name-\$sm_path-\$sha1" >../../actual
94
+ git submodule foreach "echo \$toplevel-\$name-\$sm_path-\$displaypath-\$ sha1" >../../actual
95
95
) &&
96
96
test_i18ncmp expect actual
97
97
'
@@ -206,25 +206,25 @@ submodulesha1=$(cd clone2/nested1/nested2/nested3/submodule && git rev-parse HEA
206
206
207
207
cat > expect << EOF
208
208
Entering '../nested1'
209
- toplevel: $pwd /clone2 name: nested1 path: nested1 hash: $nested1sha1
209
+ toplevel: $pwd /clone2 name: nested1 path: nested1 displaypath: ../nested1 hash: $nested1sha1
210
210
Entering '../nested1/nested2'
211
- toplevel: $pwd /clone2/nested1 name: nested2 path: nested2 hash: $nested2sha1
211
+ toplevel: $pwd /clone2/nested1 name: nested2 path: nested2 displaypath: ../nested1/nested2 hash: $nested2sha1
212
212
Entering '../nested1/nested2/nested3'
213
- toplevel: $pwd /clone2/nested1/nested2 name: nested3 path: nested3 hash: $nested3sha1
213
+ toplevel: $pwd /clone2/nested1/nested2 name: nested3 path: nested3 displaypath: ../nested1/nested2/nested3 hash: $nested3sha1
214
214
Entering '../nested1/nested2/nested3/submodule'
215
- toplevel: $pwd /clone2/nested1/nested2/nested3 name: submodule path: submodule hash: $submodulesha1
215
+ toplevel: $pwd /clone2/nested1/nested2/nested3 name: submodule path: submodule displaypath: ../nested1/nested2/nested3/submodule hash: $submodulesha1
216
216
Entering '../sub1'
217
- toplevel: $pwd /clone2 name: foo1 path: sub1 hash: $sub1sha1
217
+ toplevel: $pwd /clone2 name: foo1 path: sub1 displaypath: ../sub1 hash: $sub1sha1
218
218
Entering '../sub2'
219
- toplevel: $pwd /clone2 name: foo2 path: sub2 hash: $sub2sha1
219
+ toplevel: $pwd /clone2 name: foo2 path: sub2 displaypath: ../sub2 hash: $sub2sha1
220
220
Entering '../sub3'
221
- toplevel: $pwd /clone2 name: foo3 path: sub3 hash: $sub3sha1
221
+ toplevel: $pwd /clone2 name: foo3 path: sub3 displaypath: ../sub3 hash: $sub3sha1
222
222
EOF
223
223
224
224
test_expect_success ' test "submodule foreach --recursive" from subdirectory' '
225
225
(
226
226
cd clone2/untracked &&
227
- git submodule foreach --recursive "echo toplevel: \$toplevel name: \$name path: \$sm_path hash: \$sha1" >../../actual
227
+ git submodule foreach --recursive "echo toplevel: \$toplevel name: \$name path: \$sm_path displaypath: \$displaypath hash: \$sha1" >../../actual
228
228
) &&
229
229
test_i18ncmp expect actual
230
230
'
0 commit comments