merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
2
third_party/git/sha1dc_git.c
vendored
2
third_party/git/sha1dc_git.c
vendored
|
|
@ -19,7 +19,7 @@ void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx)
|
|||
if (!SHA1DCFinal(hash, ctx))
|
||||
return;
|
||||
die("SHA-1 appears to be part of a collision attack: %s",
|
||||
sha1_to_hex(hash));
|
||||
hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1]));
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue