diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2023-04-22 23:09:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-22 23:09:32 +0100 |
commit | 8a62616f43fe5ea37d41296f40293ff97aa88cfa (patch) | |
tree | edb5683195bb8989814ca610e6745745b361efb9 /src/libgit2/cherrypick.c | |
parent | abb0b313172d1b4477fe0c6e88102ce4bb8db90c (diff) | |
parent | b899fda3d88dc92f50e73544fb7524a1c3c70354 (diff) | |
download | libgit2-8a62616f43fe5ea37d41296f40293ff97aa88cfa.tar.gz |
Merge pull request #6549 from libgit2/ethomson/sha256_experimental
sha256: less hardcoded SHA1 types and lengths
Diffstat (limited to 'src/libgit2/cherrypick.c')
-rw-r--r-- | src/libgit2/cherrypick.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libgit2/cherrypick.c b/src/libgit2/cherrypick.c index 04812b1c6..3ef42d5e7 100644 --- a/src/libgit2/cherrypick.c +++ b/src/libgit2/cherrypick.c @@ -106,10 +106,10 @@ static int cherrypick_state_cleanup(git_repository *repo) static int cherrypick_seterr(git_commit *commit, const char *fmt) { - char commit_oidstr[GIT_OID_SHA1_HEXSIZE + 1]; + char commit_oidstr[GIT_OID_MAX_HEXSIZE + 1]; git_error_set(GIT_ERROR_CHERRYPICK, fmt, - git_oid_tostr(commit_oidstr, GIT_OID_SHA1_HEXSIZE + 1, git_commit_id(commit))); + git_oid_tostr(commit_oidstr, GIT_OID_MAX_HEXSIZE + 1, git_commit_id(commit))); return -1; } @@ -173,7 +173,7 @@ int git_cherrypick( git_cherrypick_options opts; git_reference *our_ref = NULL; git_commit *our_commit = NULL; - char commit_oidstr[GIT_OID_SHA1_HEXSIZE + 1]; + char commit_oidstr[GIT_OID_MAX_HEXSIZE + 1]; const char *commit_msg, *commit_summary; git_str their_label = GIT_STR_INIT; git_index *index = NULL; |