This is the fifth series of test fixes for SHA-256 compatibility. It
consists of 15 patches fixing various tests from t3201 through t4009 and
has only test fixes: no test helper changes are included.
Changes from v1:
* Add sanity-checking to the sed invocation.
* Remove whitespace between redirection operator and file name.
* Change "Refactor out" to "Factor out".
brian m. carlson (14):
t3201: abstract away SHA-1-specific constants
t3206: abstract away hash size constants
t3301: abstract away SHA-1-specific constants
t3305: make hash size independent
t3306: abstract away SHA-1-specific constants
t3404: abstract away SHA-1-specific constants
t3430: avoid hard-coded object IDs
t3506: make hash independent
t3600: make hash size independent
t3800: make hash-size independent
t3903: abstract away SHA-1-specific constants
t4000: make hash size independent
t4002: make hash independent
t4009: make hash size independent
t/t3201-branch-contains.sh | 8 +-
t/t3206-range-diff.sh | 227 +++++++++++++++------
t/t3301-notes.sh | 140 ++++++++-----
t/t3305-notes-fanout.sh | 22 +-
t/t3306-notes-prune.sh | 45 ++---
t/t3404-rebase-interactive.sh | 22 +-
t/t3430-rebase-merges.sh | 23 ++-
t/t3506-cherry-pick-ff.sh | 8 +-
t/t3600-rm.sh | 4 +-
t/t3800-mktag.sh | 49 ++---
t/t3903-stash.sh | 32 ++-
t/t4000-diff-format.sh | 2 +-
t/t4002-diff-basic.sh | 367 ++++++++++++++++++++++++----------
t/t4009-diff-rename-4.sh | 19 +-
14 files changed, 640 insertions(+), 328 deletions(-)
Range-diff against v1:
1: bfc39503dc ! 1: 1a0bda61ca t3903: abstract away SHA-1-specific constants
@@ t/t3903-stash.sh: test_description='Test git stash'
+ sed -e 's/^index 0000000\.\.[0-9a-f]*/index 0000000..1234567/' \
+ -e 's/^index [0-9a-f]*\.\.[0-9a-f]*/index 1234567..89abcde/' \
+ -e 's/^index [0-9a-f]*,[0-9a-f]*\.\.[0-9a-f]*/index 1234567,7654321..89abcde/' \
-+ "$i" > "$i.compare"
++ "$i" >"$i.compare" || return 1
+ done &&
+ test_cmp "$1.compare" "$2.compare" &&
+ rm -f "$1.compare" "$2.compare"
2: 2da09f10f4 = 2: 64b2fc645b t4000: make hash size independent
3: 239d6de517 ! 3: a8f0255ea0 t4002: make hash independent
@@ Metadata
## Commit message ##
t4002: make hash independent
- Refactor out the hard-coded object IDs and use test_oid to provide
- values for both SHA-1 and SHA-256.
+ Factor out the hard-coded object IDs and use test_oid to provide values
+ for both SHA-1 and SHA-256.
Signed-off-by: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx>
4: 7cb314ec8a = 4: 837d185fa6 t4009: make hash size independent
