openstack/deb-python-pygit2
Code Issues Proposed changes

Merge remote-tracking branch 'carlos/merge-checkout-safe'

Browse Source
This commit is contained in:
J. David Ibáñez
2014-09-04 09:21:39 +02:00
parent cd08425927 718c7f790c
commit 7c350bdd7c
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/repository.c
View File

@@ -608,6 +608,7 @@ Repository_merge(Repository *self, PyObject *py_oid)
if (err < 0) if (err < 0)
return Error_set(err); return Error_set(err);
checkout_opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
err = git_merge(self->repo, err = git_merge(self->repo,
(const git_merge_head **)&oid_merge_head, 1, (const git_merge_head **)&oid_merge_head, 1,
&merge_opts, &checkout_opts); &merge_opts, &checkout_opts);