t7407: Use 'rev-parse --short' rather than bash's substring expansion notation
The substring expansion notation is a bashism that we have not so far adopted. Use 'git rev-parse --short' instead, as this also handles the case where the unique abbreviation is longer than 7 characters. Also fix the typo; the object name for submodule #2 was copied from submodule #1's by mistake. Suggested-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johan Herland committed
Aug 20, 2009 at 11:24 UTC
e3ae4a8613151c93ffce78c674ac91c1ee34eef6
1 file changed
+4
-2
t/t7407-submodule-foreach.sh
+4
-2
@@ -201,14 +201,16 @@ submodulesha1=$(cd clone3/nested1/nested2/nested3/submodule && git rev-parse HEA
201
sub1sha1=$(cd clone3/sub1 && git rev-parse HEAD)
202
sub2sha1=$(cd clone3/sub2 && git rev-parse HEAD)
203
sub3sha1=$(cd clone3/sub3 && git rev-parse HEAD)
204
+sub1sha1_short=$(cd clone3/sub1 && git rev-parse --short HEAD)
205
+sub2sha1_short=$(cd clone3/sub2 && git rev-parse --short HEAD)
206
207
cat > expect <<EOF
208
$nested1sha1 nested1 (heads/master)
209
$nested2sha1 nested1/nested2 (heads/master)
210
$nested3sha1 nested1/nested2/nested3 (heads/master)
211
$submodulesha1 nested1/nested2/nested3/submodule (heads/master)
210
- $sub1sha1 sub1 (${sub1sha1:0:7})
211
- $sub2sha1 sub2 (${sub1sha1:0:7})
212
+ $sub1sha1 sub1 ($sub1sha1_short)
213
+ $sub2sha1 sub2 ($sub2sha1_short)
214
$sub3sha1 sub3 (heads/master)
215
EOF
216