]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/undecided-is-not-necessarily-sha1'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 May 2024 21:15:10 +0000 (14:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 May 2024 21:15:11 +0000 (14:15 -0700)
Before discovering the repository details, We used to assume SHA-1
as the "default" hash function, which has been corrected. Hopefully
this will smoke out codepaths that rely on such an unwarranted
assumptions.

* ps/undecided-is-not-necessarily-sha1:
  repository: stop setting SHA1 as the default object hash
  oss-fuzz/commit-graph: set up hash algorithm
  builtin/shortlog: don't set up revisions without repo
  builtin/diff: explicitly set hash algo when there is no repo
  builtin/bundle: abort "verify" early when there is no repository
  builtin/blame: don't access potentially unitialized `the_hash_algo`
  builtin/rev-parse: allow shortening to more than 40 hex characters
  remote-curl: fix parsing of detached SHA256 heads
  attr: fix BUG() when parsing attrs outside of repo
  attr: don't recompute default attribute source
  parse-options-cb: only abbreviate hashes when hash algo is known
  path: move `validate_headref()` to its only user
  path: harden validation of HEAD with non-standard hashes

1  2 
attr.c
builtin/blame.c
builtin/rev-parse.c
path.c
remote-curl.c
repository.c
setup.c
t/t0003-attributes.sh

diff --cc attr.c
Simple merge
diff --cc builtin/blame.c
Simple merge
Simple merge
diff --cc path.c
Simple merge
diff --cc remote-curl.c
Simple merge
diff --cc repository.c
Simple merge
diff --cc setup.c
Simple merge
Simple merge