diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-09-26 17:58:08 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2021-09-26 18:02:07 -0400 |
| commit | 0bd132ab829f41971355537ecc4f9d24f953ccec (patch) | |
| tree | f2077ec3f7e71dec8a7a26f04c6af481d28e5500 /src/merge.c | |
| parent | 136901086ecfdd2b5cc106782310355a9c0b1a9a (diff) | |
| download | libgit2-ethomson/oidarray_dispose.tar.gz | |
oidarray: introduce `git_oidarray_dispose`ethomson/oidarray_dispose
Since users are disposing the _contents_ of the oidarray, not freeing
the oidarray itself, the proper cleanup function is
`git_oidarray_dispose`. Deprecate `git_oidarray_free`.
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 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; } |