Merge branch 'bc/hash-independent-tests-part-8'

Preparation for SHA-256 migration continues.

* bc/hash-independent-tests-part-8: (21 commits)
  t6024: update for SHA-256
  t6006: make hash size independent
  t6000: abstract away SHA-1-specific constants
  t5703: make test work with SHA-256
  t5607: make hash size independent
  t5318: update for SHA-256
  t5515: make test hash independent
  t5321: make test hash independent
  t5313: make test hash independent
  t5309: make test hash independent
  t5302: make hash size independent
  t4060: make test work with SHA-256
  t4211: add test cases for SHA-256
  t4211: move SHA-1-specific test cases into a directory
  t4013: make test hash independent
  t3311: make test work with SHA-256
  t3310: make test work with SHA-256
  t3309: make test work with SHA-256
  t3308: make test work with SHA-256
  t3206: make hash size independent
  ...

diff --cc t/t3310-notes-merge-manual-resolve.sh
index d746f4ba550879685a4e7ad357c39b417dbf6d32,806d812a17343655fa70d5204c9ca9227b7c6cae..d3d72e25fe4b5ba05527d1378841978029f4c543
--- 1/t/t3310-notes-merge-manual-resolve.sh
--- 2/t/t3310-notes-merge-manual-resolve.sh
+++ b/t/t3310-notes-merge-manual-resolve.sh
@@@ -32,16 -64,10 +64,16 @@@ verify_notes () 
        test_cmp "expect_log_$notes_ref" "output_log_$notes_ref"
  }
  
 +notes_merge_files_gone () {
 +      # No .git/NOTES_MERGE_* files left
 +      { ls .git/NOTES_MERGE_* >output || :; } &&
 +      test_must_be_empty output
 +}
 +
  cat <<EOF | sort >expect_notes_x
- 6e8e3febca3c2bb896704335cc4d0c34cb2f8715 $commit_sha4
- e5388c10860456ee60673025345fe2e153eb8cf8 $commit_sha3
- ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2
+ $(test_oid hash04a) $commit_sha4
+ $(test_oid hash03a) $commit_sha3
+ $(test_oid hash02a) $commit_sha2
  EOF
  
  cat >expect_log_x <<EOF

diff --cc t/t5309-pack-delta-cycles.sh
Simple merge

diff --cc t/t5318-commit-graph.sh
Simple merge

diff --cc t/t5515-fetch-merge-logic.sh
Simple merge