diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-01-17 23:28:53 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-02-14 09:25:35 -0500 |
| commit | 8b0ddd5dd90e1d62f32faf14d5cb4bf88f04a095 (patch) | |
| tree | 5b132d61f079508ae55d8ba4d7151f1335a2ce72 /src/cherrypick.c | |
| parent | 8639ea5f98ac53e532820e8a186f8a1d6d98f573 (diff) | |
| download | libgit2-8b0ddd5dd90e1d62f32faf14d5cb4bf88f04a095.tar.gz | |
merge: lock the index at the start of the merge
Always lock the index when we begin the merge, before we write
any of the metdata files. This prevents a race where another
client may run a commit after we have written the MERGE_HEAD but
before we have updated the index, which will produce a merge
commit that is treesame to one parent. The merge will finish and
update the index and the resultant commit would not be a merge at
all.
Diffstat (limited to 'src/cherrypick.c')
0 files changed, 0 insertions, 0 deletions