diff options
| author | Ben Straub <bs@github.com> | 2014-02-05 13:32:45 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2014-02-05 13:32:45 -0800 |
| commit | 5c8be3255905f77d60a239381d9ce39a6934a038 (patch) | |
| tree | 920cfb3549547bc0886077f7e08ad64e2cca7f23 /tests/merge | |
| parent | 0de2c4e3a3cb63a2af66c464585d0e9ae273ddee (diff) | |
| download | libgit2-5c8be3255905f77d60a239381d9ce39a6934a038.tar.gz | |
Fix a few references to changed function signatures
Diffstat (limited to 'tests/merge')
| -rw-r--r-- | tests/merge/workdir/dirty.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/merge/workdir/dirty.c b/tests/merge/workdir/dirty.c index 625d3d01a..a77f9b205 100644 --- a/tests/merge/workdir/dirty.c +++ b/tests/merge/workdir/dirty.c @@ -183,7 +183,7 @@ static void stage_content(char *content[]) cl_git_pass(git_repository_head(&head, repo)); cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD)); + cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL, NULL)); for (i = 0, filename = content[i], text = content[++i]; filename && text; @@ -212,7 +212,7 @@ static int merge_dirty_files(char *dirty_files[]) cl_git_pass(git_repository_head(&head, repo)); cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD)); + cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL, NULL)); write_files(dirty_files); @@ -234,7 +234,7 @@ static int merge_differently_filtered_files(char *files[]) cl_git_pass(git_repository_head(&head, repo)); cl_git_pass(git_reference_peel(&head_object, head, GIT_OBJ_COMMIT)); - cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD)); + cl_git_pass(git_reset(repo, head_object, GIT_RESET_HARD, NULL, NULL)); write_files(files); hack_index(files); |