Skip to content

G
git2
Commit e01df928 by Edward Thomson
Options

cherrypick: support sha256

parent f4774446
Showing with 3 additions and 3 deletions
src/libgit2/cherrypick.c
...@@ -106,10 +106,10 @@ static int cherrypick_state_cleanup(git_repository *repo) ...@@ -106,10 +106,10 @@ static int cherrypick_state_cleanup(git_repository *repo)
static int cherrypick_seterr(git_commit *commit, const char *fmt) 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_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; return -1;
} }
...@@ -173,7 +173,7 @@ int git_cherrypick( ...@@ -173,7 +173,7 @@ int git_cherrypick(
git_cherrypick_options opts; git_cherrypick_options opts;
git_reference *our_ref = NULL; git_reference *our_ref = NULL;
git_commit *our_commit = 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; const char *commit_msg, *commit_summary;
git_str their_label = GIT_STR_INIT; git_str their_label = GIT_STR_INIT;
git_index *index = NULL; git_index *index = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment