diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/merge.c | 2 | ||||
| -rw-r--r-- | src/oidarray.c | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index 1c841bdfb..d838e4ba9 100644 --- a/src/merge.c +++ b/src/merge.c @@ -2369,7 +2369,7 @@ done: git_annotated_commit_free(other); git_annotated_commit_free(new_base); - git_oidarray_free(&bases); + git_oidarray_dispose(&bases); git_array_clear(head_ids); return error; } diff --git a/src/oidarray.c b/src/oidarray.c index e70e9dd61..583017c4e 100644 --- a/src/oidarray.c +++ b/src/oidarray.c @@ -10,7 +10,7 @@ #include "git2/oidarray.h" #include "array.h" -void git_oidarray_free(git_oidarray *arr) +void git_oidarray_dispose(git_oidarray *arr) { git__free(arr->ids); } @@ -32,3 +32,12 @@ void git_oidarray__reverse(git_oidarray *arr) git_oid_cpy(&arr->ids[(arr->count-1)-i], &tmp); } } + +#ifndef GIT_DEPRECATE_HARD + +void git_oidarray_free(git_oidarray *arr) +{ + git_oidarray_dispose(arr); +} + +#endif |