This is part 2 in the series to make tests hash independent.
This series introduces an SHA1 prerequisite which checks if the hash in
use is SHA-1, and can be used to skip the test if it is not.
Additionally, because NewHash will be 256-bit, I introduced aliases for
the test constants $_x40 and $_z40 which will be less confusing when the
hash isn't 40 hex characters long. I opted to leave the old names in
place for the moment to prevent any potential conflicts with other
series and will clean up any stragglers later.
This version addresses the concerns raised about robustness in case git
hash-object fails in an unexpected way. We now have better error
handling for that case by performing git rev-parse and git hash-object
in separate steps.
Changes from v2:
* Split out git rev-parse --short and git hash-object into separate
stages for better error handling.
Changes from v1:
* Amend commit message to indicate that we *will* be updating tests
annotated with the SHA1 prerequisite to work with NewHash.
* Rename FULL_HEX to OID_REGEX.
* Regenerate patch for OID_REGEX.
* Update variable name from "link_oid" to "slink_id" for consistency
while still preserving alignment.
* Restore blank line between tests.
tbdiff output below.
brian m. carlson (28):
t/test-lib: add an SHA1 prerequisite
t/test-lib: introduce ZERO_OID
t: switch $_z40 to $ZERO_OID
t/test-lib: introduce OID_REGEX
t: switch $_x40 to $OID_REGEX
t0000: annotate with SHA1 prerequisite
t1007: annotate with SHA1 prerequisite
t1512: skip test if not using SHA-1
t4044: skip test if not using SHA-1
t: skip pack tests if not using SHA-1
t2203: abstract away SHA-1-specific constants
t3103: abstract away SHA-1-specific constants
t3702: abstract away SHA-1-specific constants
t3905: abstract away SHA-1-specific constants
t4007: abstract away SHA-1-specific constants
t4008: abstract away SHA-1-specific constants
t4014: abstract away SHA-1-specific constants
t4020: abstract away SHA-1-specific constants
t4022: abstract away SHA-1-specific constants
t4029: fix test indentation
t4029: abstract away SHA-1-specific constants
t4030: abstract away SHA-1-specific constants
t/lib-diff-alternative: abstract away SHA-1-specific constants
t4205: sort log output in a hash-independent way
t4042: abstract away SHA-1-specific constants
t4045: abstract away SHA-1-specific constants
t4208: abstract away SHA-1-specific constants
t5300: abstract away SHA-1-specific constants
t/diff-lib.sh | 4 +-
t/lib-diff-alternative.sh | 12 ++++--
t/t0000-basic.sh | 24 ++++++------
t/t0090-cache-tree.sh | 2 +-
t/t1000-read-tree-m-3way.sh | 2 +-
t/t1001-read-tree-m-2way.sh | 2 +-
t/t1002-read-tree-m-u-2way.sh | 2 +-
t/t1006-cat-file.sh | 8 ++--
t/t1007-hash-object.sh | 16 ++++----
t/t1012-read-tree-df.sh | 2 +-
t/t1400-update-ref.sh | 2 +-
t/t1407-worktree-ref-store.sh | 8 ++--
t/t1450-fsck.sh | 4 +-
t/t1501-work-tree.sh | 6 +--
t/t1512-rev-parse-disambiguation.sh | 6 +++
t/t1601-index-bogus.sh | 2 +-
t/t1700-split-index.sh | 2 +-
t/t2011-checkout-invalid-head.sh | 2 +-
t/t2025-worktree-add.sh | 8 ++--
t/t2027-worktree-list.sh | 2 +-
t/t2107-update-index-basic.sh | 4 +-
t/t2201-add-update-typechange.sh | 16 ++++----
t/t2203-add-intent.sh | 14 +++----
t/t3100-ls-tree-restrict.sh | 2 +-
t/t3101-ls-tree-dirname.sh | 2 +-
t/t3103-ls-tree-misc.sh | 3 +-
t/t3200-branch.sh | 4 +-
t/t3510-cherry-pick-sequence.sh | 8 ++--
t/t3702-add-edit.sh | 7 ++--
t/t3905-stash-include-untracked.sh | 11 ++++--
t/t4002-diff-basic.sh | 2 +-
t/t4006-diff-mode.sh | 2 +-
t/t4007-rename-3.sh | 17 +++++----
t/t4008-diff-break-rewrite.sh | 59 ++++++++++++++++-------------
t/t4014-format-patch.sh | 13 ++++---
t/t4020-diff-external.sh | 20 ++++++----
t/t4022-diff-rewrite.sh | 6 ++-
t/t4027-diff-submodule.sh | 6 +--
t/t4029-diff-trailing-space.sh | 40 ++++++++++---------
t/t4030-diff-textconv.sh | 5 ++-
t/t4042-diff-textconv-caching.sh | 16 +++++---
t/t4044-diff-index-unique-abbrev.sh | 6 +++
t/t4045-diff-relative.sh | 6 ++-
t/t4046-diff-unmerged.sh | 14 +++----
t/t4054-diff-bogus-tree.sh | 12 +++---
t/t4058-diff-duplicates.sh | 12 +++---
t/t4150-am.sh | 4 +-
t/t4200-rerere.sh | 2 +-
t/t4201-shortlog.sh | 2 +-
t/t4205-log-pretty-formats.sh | 8 ++--
t/t4208-log-magic-pathspec.sh | 3 +-
t/t5150-request-pull.sh | 2 +-
t/t5300-pack-object.sh | 8 ++--
t/t5308-pack-detect-duplicates.sh | 6 +++
t/t5309-pack-delta-cycles.sh | 6 +++
t/t5516-fetch-push.sh | 22 +++++------
t/t5527-fetch-odd-refs.sh | 2 +-
t/t5571-pre-push-hook.sh | 8 ++--
t/t6006-rev-list-format.sh | 4 +-
t/t6012-rev-list-simplify.sh | 2 +-
t/t6111-rev-list-treesame.sh | 2 +-
t/t6120-describe.sh | 2 +-
t/t6300-for-each-ref.sh | 2 +-
t/t6301-for-each-ref-errors.sh | 2 +-
t/t7009-filter-branch-null-sha1.sh | 2 +-
t/t7011-skip-worktree-reading.sh | 2 +-
t/t7064-wtstatus-pv2.sh | 58 ++++++++++++++--------------
t/t7506-status-submodule.sh | 2 +-
t/t9010-svn-fe.sh | 14 +++----
t/t9300-fast-import.sh | 6 +--
t/test-lib.sh | 11 +++++-
71 files changed, 338 insertions(+), 267 deletions(-)
tbdiff output:
1: 1a2e23b4f8 = 1: 1a2e23b4f8 t/test-lib: add an SHA1 prerequisite
2: 809ac7d7c3 = 2: 809ac7d7c3 t/test-lib: introduce ZERO_OID
3: 1394616579 = 3: 1394616579 t: switch $_z40 to $ZERO_OID
4: adbbf8af80 = 4: adbbf8af80 t/test-lib: introduce OID_REGEX
5: 77877cd04e = 5: 77877cd04e t: switch $_x40 to $OID_REGEX
6: 41c01b5fcf = 6: 41c01b5fcf t0000: annotate with SHA1 prerequisite
7: c175f5d565 = 7: c175f5d565 t1007: annotate with SHA1 prerequisite
8: 936a8d90fd = 8: 936a8d90fd t1512: skip test if not using SHA-1
9: 18a2c50777 = 9: 18a2c50777 t4044: skip test if not using SHA-1
10: bdb27df589 = 10: bdb27df589 t: skip pack tests if not using SHA-1
11: d09b454988 = 11: d09b454988 t2203: abstract away SHA-1-specific constants
12: 61c93d4d8a = 12: 61c93d4d8a t3103: abstract away SHA-1-specific constants
13: 2fdf7883c2 = 13: 2fdf7883c2 t3702: abstract away SHA-1-specific constants
14: 9e99a40aa1 = 14: 9e99a40aa1 t3905: abstract away SHA-1-specific constants
15: ad45ab6bed = 15: ad45ab6bed t4007: abstract away SHA-1-specific constants
16: 56a69fbe23 = 16: 56a69fbe23 t4008: abstract away SHA-1-specific constants
17: 11c545cd51 ! 17: c47c098f00 t4014: abstract away SHA-1-specific constants
@@ -14,9 +14,11 @@
rm -rf patches/ &&
git checkout side &&
-+ before=$(git rev-parse --short $(git hash-object file)) &&
++ before=$(git hash-object file) &&
++ before=$(git rev-parse --short $before) &&
for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >>file &&
-+ after=$(git rev-parse --short $(git hash-object file)) &&
++ after=$(git hash-object file) &&
++ after=$(git rev-parse --short $after) &&
git update-index file &&
git commit -m "This is an excessively long subject line for a message due to the habit some projects have of not having a short, one-line subject at the start of the commit message, but rather sticking a whole paragraph right at the start as the only thing in the commit message. It had better not become the filename for the patch." &&
git format-patch -o patches/ master..side &&
18: fcca4074e6 ! 18: 73a639c361 t4020: abstract away SHA-1-specific constants
@@ -14,7 +14,8 @@
test_tick &&
echo second >file &&
-+ before=$(git rev-parse --short $(git hash-object file)) &&
++ before=$(git hash-object file) &&
++ before=$(git rev-parse --short $before) &&
git add file &&
git commit -m second &&
@@ -22,7 +23,8 @@
echo NULZbetweenZwords | perl -pe 'y/Z/\000/' > file
test_expect_success 'force diff with "diff"' '
-+ after=$(git rev-parse --short $(git hash-object file)) &&
++ after=$(git hash-object file) &&
++ after=$(git rev-parse --short $after) &&
echo >.gitattributes "file diff" &&
git diff >actual &&
- test_cmp "$TEST_DIRECTORY"/t4020/diff.NUL actual
19: ad252e46c4 ! 19: 4bd0bae327 t4022: abstract away SHA-1-specific constants
@@ -14,7 +14,8 @@
"nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
<"$TEST_DIRECTORY"/../COPYING >test &&
echo "to be deleted" >test2 &&
-+ blob=$(git rev-parse --short $(git hash-object test2)) &&
++ blob=$(git hash-object test2) &&
++ blob=$(git rev-parse --short $blob) &&
git add test2
'
20: 4046eecebd = 20: 2d7c33aff5 t4029: fix test indentation
21: 56896e45f0 ! 21: 009f98c0ba t4029: abstract away SHA-1-specific constants
@@ -23,11 +23,13 @@
test_expect_success "$test_description" '
printf "\nx\n" > f &&
-+ before=$(git rev-parse --short $(git hash-object f)) &&
++ before=$(git hash-object f) &&
++ before=$(git rev-parse --short $before) &&
git add f &&
git commit -q -m. f &&
printf "\ny\n" > f &&
-+ after=$(git rev-parse --short $(git hash-object f)) &&
++ after=$(git hash-object f) &&
++ after=$(git rev-parse --short $after) &&
+ sed -e "s/^index .*/index $before..$after 100644/" expected >exp &&
git config --bool diff.suppressBlankEmpty true &&
git diff f > actual &&
22: 27609ec546 = 22: 97bbd51a80 t4030: abstract away SHA-1-specific constants
23: 8c782009bf = 23: 743fc9151d t/lib-diff-alternative: abstract away SHA-1-specific constants
24: 2f0da3e1b8 = 24: 8fd963968b t4205: sort log output in a hash-independent way
25: 3e913f2526 = 25: 9bf0d6ef62 t4042: abstract away SHA-1-specific constants
26: 2261c64650 = 26: 42d9cfaa1a t4045: abstract away SHA-1-specific constants
27: 458006036a = 27: e66a684559 t4208: abstract away SHA-1-specific constants
28: 8da8c65428 = 28: 1ca2b3478d t5300: abstract away SHA-1-specific constants
