Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t5300: abstract away SHA-1-specific constants
author
brian m. carlson
<sandals@crustytoothpaste.net>
Mon, 21 May 2018 02:01:47 +0000
(
02:01
+0000)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 21 May 2018 04:55:48 +0000
(13:55 +0900)
Adjust the test so that it computes variables for object IDs instead of
using hard-coded hashes.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5300-pack-object.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
0b2c4af
)
diff --git
a/t/t5300-pack-object.sh
b/t/t5300-pack-object.sh
index 65ff60f2ee9b4af61f3f2d7d0f889fc4529e2b60..9e66637a19e08821124abec704aee85a423e58a3 100755
(executable)
--- a/
t/t5300-pack-object.sh
+++ b/
t/t5300-pack-object.sh
@@
-466,9
+466,11
@@
test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'pack-objects --threads=N or pack.
test_expect_success \
'fake a SHA1 hash collision' \
test_expect_success \
'fake a SHA1 hash collision' \
- 'test -f .git/objects/c8/2de19312b6c3695c0c18f70709a6c535682a67 &&
- cp -f .git/objects/9d/235ed07cd19811a6ceb342de82f190e49c9f68 \
- .git/objects/c8/2de19312b6c3695c0c18f70709a6c535682a67'
+ 'long_a=$(git hash-object a | sed -e "s!^..!&/!") &&
+ long_b=$(git hash-object b | sed -e "s!^..!&/!") &&
+ test -f .git/objects/$long_b &&
+ cp -f .git/objects/$long_a \
+ .git/objects/$long_b'
test_expect_success \
'make sure index-pack detects the SHA1 collision' \
test_expect_success \
'make sure index-pack detects the SHA1 collision' \