vendor/libgit2/src/libgit2/cherrypick.c in rugged-1.6.5 vs vendor/libgit2/src/libgit2/cherrypick.c in rugged-1.7.1
- old
+ new
@@ -104,14 +104,14 @@
return git_repository__cleanup_files(repo, state_files, ARRAY_SIZE(state_files));
}
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;
}
int git_cherrypick_commit(
@@ -171,10 +171,10 @@
const git_cherrypick_options *given_opts)
{
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;
git_indexwriter indexwriter = GIT_INDEXWRITER_INIT;
int error = 0;