proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-30 22:24:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't copy buffer in checkout unless needed

Browse Source
This commit is contained in:
Edward Thomson 2014-10-11 21:38:22 -04:00
parent 5e2cf2ca2c
commit 6a26488f8b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/checkout.c
View File

@ -1813,14 +1813,17 @@ static int checkout_write_merge(
goto done; goto done;
if (!data->opts.disable_filters) { if (!data->opts.disable_filters) {
if ((error = git_buf_put(&in_data, result.ptr, result.len)) < 0 || in_data.ptr = (char *)result.ptr;
(error = git_filter_list_load(&fl, data->repo, NULL, git_buf_cstr(&path_workdir), in_data.size = result.len;
if ((error = git_filter_list_load(&fl, data->repo, NULL, git_buf_cstr(&path_workdir),
GIT_FILTER_TO_WORKTREE, GIT_FILTER_OPT_DEFAULT)) < 0 || GIT_FILTER_TO_WORKTREE, GIT_FILTER_OPT_DEFAULT)) < 0 ||
(error = git_filter_list_apply_to_data(&out_data, fl, &in_data)) < 0) (error = git_filter_list_apply_to_data(&out_data, fl, &in_data)) < 0)
goto done; goto done;
} else if ((error = git_buf_put(&out_data, result.ptr, result.len)) < 0) } else {
goto done; out_data.ptr = (char *)result.ptr;
out_data.size = result.len;
}
if ((error = git_futils_mkpath2file(path_workdir.ptr, 0755)) < 0 || if ((error = git_futils_mkpath2file(path_workdir.ptr, 0755)) < 0 ||
(error = git_filebuf_open(&output, git_buf_cstr(&path_workdir), GIT_FILEBUF_DO_NOT_BUFFER, result.mode)) < 0 || (error = git_filebuf_open(&output, git_buf_cstr(&path_workdir), GIT_FILEBUF_DO_NOT_BUFFER, result.mode)) < 0 ||
@ -1832,7 +1835,6 @@ done:
git_filter_list_free(fl); git_filter_list_free(fl);
git_buf_free(&out_data); git_buf_free(&out_data);
git_buf_free(&in_data);
git_buf_free(&our_label); git_buf_free(&our_label);
git_buf_free(&their_label); git_buf_free(&their_label);