diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-06-11 18:26:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-11 18:26:22 +0100 |
| commit | 3be7301151e44537d2423386dc71f1d3e496c664 (patch) | |
| tree | 655ff1fc09e227c77a1c8853706e5180a78f5a50 /src/merge.c | |
| parent | e6444dacb88e29e75fee81a87d1876db77d43362 (diff) | |
| parent | ecf4f33a4e327a91496f72816f9f02d923e5af05 (diff) | |
| download | libgit2-3be7301151e44537d2423386dc71f1d3e496c664.tar.gz | |
Merge pull request #4436 from pks-t/pks/packfile-stream-free
pack: rename `git_packfile_stream_free`
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/merge.c b/src/merge.c index 6c98d13fb..068a23e20 100644 --- a/src/merge.c +++ b/src/merge.c @@ -599,8 +599,8 @@ int git_repository_mergehead_foreach( } cleanup: - git_buf_free(&merge_head_path); - git_buf_free(&merge_head_file); + git_buf_dispose(&merge_head_path); + git_buf_dispose(&merge_head_file); return error; } @@ -875,7 +875,7 @@ static int merge_conflict_invoke_driver( *out = result; done: - git_buf_free(&buf); + git_buf_dispose(&buf); git_odb_free(odb); return error; @@ -2444,7 +2444,7 @@ cleanup: if (error < 0) git_filebuf_cleanup(&file); - git_buf_free(&file_path); + git_buf_dispose(&file_path); return error; } @@ -2470,7 +2470,7 @@ cleanup: if (error < 0) git_filebuf_cleanup(&file); - git_buf_free(&file_path); + git_buf_dispose(&file_path); return error; } @@ -2770,7 +2770,7 @@ cleanup: if (error < 0) git_filebuf_cleanup(&file); - git_buf_free(&file_path); + git_buf_dispose(&file_path); git_vector_free(&matching); git__free(entries); @@ -3090,7 +3090,7 @@ cleanup: if (error < 0) git_filebuf_cleanup(&file); - git_buf_free(&file_path); + git_buf_dispose(&file_path); return error; } |