diff options
Diffstat (limited to 'src/libgit2/merge.c')
| -rw-r--r-- | src/libgit2/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libgit2/merge.c b/src/libgit2/merge.c index 641b32632..01f60abc5 100644 --- a/src/libgit2/merge.c +++ b/src/libgit2/merge.c @@ -611,7 +611,7 @@ int git_repository_mergehead_foreach( buffer = merge_head_file.ptr; while ((line = git__strsep(&buffer, "\n")) != NULL) { - if (strlen(line) != GIT_OID_HEXSZ) { + if (strlen(line) != GIT_OID_SHA1_HEXSIZE) { git_error_set(GIT_ERROR_INVALID, "unable to parse OID - invalid length"); error = -1; goto cleanup; |