diff options
| author | Russell Belfer <rb@github.com> | 2014-02-07 16:14:17 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2014-02-07 16:14:17 -0800 |
| commit | 2d9291943c253e9e1520f87b13abb1e81cffdb29 (patch) | |
| tree | 653489f8d29124bb0a6d32d14dfed9d9974bc267 /tests/index | |
| parent | 57c47af107b45b73a46a1d157f8f758edd536bc7 (diff) | |
| parent | db55bb73ff4bccbaccbb4c3a7f6b1fcf09498df7 (diff) | |
| download | libgit2-2d9291943c253e9e1520f87b13abb1e81cffdb29.tar.gz | |
Merge pull request #2099 from libgit2/bs/more-reflog-stuff
More reflogness
Diffstat (limited to 'tests/index')
| -rw-r--r-- | tests/index/names.c | 8 | ||||
| -rw-r--r-- | tests/index/reuc.c | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/index/names.c b/tests/index/names.c index 9007b1b15..4723449d9 100644 --- a/tests/index/names.c +++ b/tests/index/names.c @@ -86,10 +86,10 @@ void test_index_names__cleaned_on_reset_hard(void) { git_object *target; - retrieve_target_from_oid(&target, repo, "3a34580a35add43a4cf361e8e9a30060a905c876"); + cl_git_pass(git_revparse_single(&target, repo, "3a34580")); test_index_names__add(); - cl_git_pass(git_reset(repo, target, GIT_RESET_HARD)); + cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL, NULL)); cl_assert(git_index_name_entrycount(repo_index) == 0); git_object_free(target); @@ -99,10 +99,10 @@ void test_index_names__cleaned_on_reset_mixed(void) { git_object *target; - retrieve_target_from_oid(&target, repo, "3a34580a35add43a4cf361e8e9a30060a905c876"); + cl_git_pass(git_revparse_single(&target, repo, "3a34580")); test_index_names__add(); - cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED)); + cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL, NULL)); cl_assert(git_index_name_entrycount(repo_index) == 0); git_object_free(target); diff --git a/tests/index/reuc.c b/tests/index/reuc.c index a18d5602e..bf051c827 100644 --- a/tests/index/reuc.c +++ b/tests/index/reuc.c @@ -295,10 +295,10 @@ void test_index_reuc__cleaned_on_reset_hard(void) { git_object *target; - retrieve_target_from_oid(&target, repo, "3a34580a35add43a4cf361e8e9a30060a905c876"); + cl_git_pass(git_revparse_single(&target, repo, "3a34580")); test_index_reuc__add(); - cl_git_pass(git_reset(repo, target, GIT_RESET_HARD)); + cl_git_pass(git_reset(repo, target, GIT_RESET_HARD, NULL, NULL)); cl_assert(reuc_entry_exists() == false); git_object_free(target); @@ -308,10 +308,10 @@ void test_index_reuc__cleaned_on_reset_mixed(void) { git_object *target; - retrieve_target_from_oid(&target, repo, "3a34580a35add43a4cf361e8e9a30060a905c876"); + cl_git_pass(git_revparse_single(&target, repo, "3a34580")); test_index_reuc__add(); - cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED)); + cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL, NULL)); cl_assert(reuc_entry_exists() == false); git_object_free(target); @@ -321,12 +321,12 @@ void test_index_reuc__retained_on_reset_soft(void) { git_object *target; - retrieve_target_from_oid(&target, repo, "3a34580a35add43a4cf361e8e9a30060a905c876"); + cl_git_pass(git_revparse_single(&target, repo, "3a34580")); - git_reset(repo, target, GIT_RESET_HARD); + git_reset(repo, target, GIT_RESET_HARD, NULL, NULL); test_index_reuc__add(); - cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT)); + cl_git_pass(git_reset(repo, target, GIT_RESET_SOFT, NULL, NULL)); cl_assert(reuc_entry_exists() == true); git_object_free(target); |