Skip to content

Commit 189a546

Browse files
artagnongitster
authored andcommitted
t6300 (for-each-ref): don't hardcode SHA-1 hexes
Use rev-parse in its place, making it easier for future patches to modify the test script. Signed-off-by: Ramkumar Ramachandra <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent bc14796 commit 189a546

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

t/t6300-for-each-ref.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ test_atom head refname refs/heads/master
4949
test_atom head upstream refs/remotes/origin/master
5050
test_atom head objecttype commit
5151
test_atom head objectsize 171
52-
test_atom head objectname 67a36f10722846e891fbada1ba48ed035de75581
53-
test_atom head tree 0e51c00fcb93dffc755546f27593d511e1bdb46f
52+
test_atom head objectname $(git rev-parse refs/heads/master)
53+
test_atom head tree $(git rev-parse refs/heads/master^{tree})
5454
test_atom head parent ''
5555
test_atom head numparent 0
5656
test_atom head object ''
@@ -82,11 +82,11 @@ test_atom tag refname refs/tags/testtag
8282
test_atom tag upstream ''
8383
test_atom tag objecttype tag
8484
test_atom tag objectsize 154
85-
test_atom tag objectname 98b46b1d36e5b07909de1b3886224e3e81e87322
85+
test_atom tag objectname $(git rev-parse refs/tags/testtag)
8686
test_atom tag tree ''
8787
test_atom tag parent ''
8888
test_atom tag numparent ''
89-
test_atom tag object '67a36f10722846e891fbada1ba48ed035de75581'
89+
test_atom tag object $(git rev-parse refs/tags/testtag^0)
9090
test_atom tag type 'commit'
9191
test_atom tag author ''
9292
test_atom tag authorname ''
@@ -302,7 +302,7 @@ test_expect_success 'Check short upstream format' '
302302
'
303303

304304
cat >expected <<EOF
305-
67a36f1
305+
$(git rev-parse --short HEAD)
306306
EOF
307307

308308
test_expect_success 'Check short objectname format' '
@@ -453,9 +453,9 @@ test_atom refs/tags/signed-long contents "subject line
453453
body contents
454454
$sig"
455455

456-
cat >expected <<\EOF
457-
408fe76d02a785a006c2e9c669b7be5589ede96d <[email protected]> refs/tags/master
458-
90b5ebede4899eda64893bc2a4c8f1d6fb6dfc40 <[email protected]> refs/tags/bogo
456+
cat >expected <<EOF
457+
$(git rev-parse refs/tags/master) <[email protected]> refs/tags/master
458+
$(git rev-parse refs/tags/bogo) <[email protected]> refs/tags/bogo
459459
EOF
460460

461461
test_expect_success 'Verify sort with multiple keys' '

0 commit comments

Comments
 (0)