Skip to content

Commit 0281733

Browse files
gitstergitster
committed
Merge branch 'bc/hash-independent-tests-part-5'
Preparation for SHA-256 upgrade continues in the test department. * bc/hash-independent-tests-part-5: t4009: make hash size independent t4002: make hash independent t4000: make hash size independent t3903: abstract away SHA-1-specific constants t3800: make hash-size independent t3600: make hash size independent t3506: make hash independent t3430: avoid hard-coded object IDs t3404: abstract away SHA-1-specific constants t3306: abstract away SHA-1-specific constants t3305: make hash size independent t3301: abstract away SHA-1-specific constants t3206: abstract away hash size constants t3201: abstract away SHA-1-specific constants
2 parents f06fb37 + 0c37c41 commit 0281733

14 files changed

+640
-328
lines changed

‎t/t3201-branch-contains.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,10 @@ test_expect_success 'branch --merged with --verbose' '
192192
EOF
193193
test_cmp expect actual &&
194194
git branch --verbose --merged topic >actual &&
195-
cat >expect <<-\EOF &&
196-
master c77a0a9 second on master
197-
* topic 2c939f4 [ahead 1] foo
198-
zzz c77a0a9 second on master
195+
cat >expect <<-EOF &&
196+
master $(git rev-parse --short master) second on master
197+
* topic $(git rev-parse --short topic ) [ahead 1] foo
198+
zzz $(git rev-parse --short zzz ) second on master
199199
EOF
200200
test_i18ncmp expect actual
201201
'

0 commit comments

Comments
 (0)