diff options
| -rw-r--r-- | include/git2/reflog.h | 2 | ||||
| -rw-r--r-- | src/reflog.c | 2 | ||||
| -rw-r--r-- | tests-clar/refs/reflog/drop.c | 18 |
3 files changed, 11 insertions, 11 deletions
diff --git a/include/git2/reflog.h b/include/git2/reflog.h index a314f94c2..a73d1f7fd 100644 --- a/include/git2/reflog.h +++ b/include/git2/reflog.h @@ -109,7 +109,7 @@ GIT_EXTERN(const git_reflog_entry *) git_reflog_entry_byindex(git_reflog *reflog * * @return 0 on success or an error code. */ -GIT_EXTERN(int) git_reflog_entry_drop( +GIT_EXTERN(int) git_reflog_drop( git_reflog *reflog, unsigned int idx, int rewrite_previous_entry); diff --git a/src/reflog.c b/src/reflog.c index f841b2174..445e53942 100644 --- a/src/reflog.c +++ b/src/reflog.c @@ -439,7 +439,7 @@ char * git_reflog_entry_msg(const git_reflog_entry *entry) return entry->msg; } -int git_reflog_entry_drop( +int git_reflog_drop( git_reflog *reflog, unsigned int idx, int rewrite_previous_entry) diff --git a/tests-clar/refs/reflog/drop.c b/tests-clar/refs/reflog/drop.c index 3aa99fe09..86781c041 100644 --- a/tests-clar/refs/reflog/drop.c +++ b/tests-clar/refs/reflog/drop.c @@ -28,7 +28,7 @@ void test_refs_reflog_drop__cleanup(void) void test_refs_reflog_drop__dropping_a_non_exisiting_entry_from_the_log_returns_ENOTFOUND(void) { - cl_assert_equal_i(GIT_ENOTFOUND, git_reflog_entry_drop(g_reflog, entrycount, 0)); + cl_assert_equal_i(GIT_ENOTFOUND, git_reflog_drop(g_reflog, entrycount, 0)); cl_assert_equal_i(entrycount, git_reflog_entrycount(g_reflog)); } @@ -37,7 +37,7 @@ void test_refs_reflog_drop__can_drop_an_entry(void) { cl_assert(entrycount > 4); - cl_git_pass(git_reflog_entry_drop(g_reflog, 2, 0)); + cl_git_pass(git_reflog_drop(g_reflog, 2, 0)); cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); } @@ -53,7 +53,7 @@ void test_refs_reflog_drop__can_drop_an_entry_and_rewrite_the_log_history(void) before_next = git_reflog_entry_byindex(g_reflog, 1); git_oid_cpy(&before_next_old_oid, &before_next->oid_old); - cl_git_pass(git_reflog_entry_drop(g_reflog, 2, 1)); + cl_git_pass(git_reflog_drop(g_reflog, 2, 1)); cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); after_next = git_reflog_entry_byindex(g_reflog, 1); @@ -67,7 +67,7 @@ void test_refs_reflog_drop__can_drop_the_first_entry(void) { cl_assert(entrycount > 2); - cl_git_pass(git_reflog_entry_drop(g_reflog, 0, 0)); + cl_git_pass(git_reflog_drop(g_reflog, 0, 0)); cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); } @@ -77,7 +77,7 @@ void test_refs_reflog_drop__can_drop_the_last_entry(void) cl_assert(entrycount > 2); - cl_git_pass(git_reflog_entry_drop(g_reflog, entrycount - 1, 0)); + cl_git_pass(git_reflog_drop(g_reflog, entrycount - 1, 0)); cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); entry = git_reflog_entry_byindex(g_reflog, entrycount - 2); @@ -90,7 +90,7 @@ void test_refs_reflog_drop__can_drop_the_last_entry_and_rewrite_the_log_history( cl_assert(entrycount > 2); - cl_git_pass(git_reflog_entry_drop(g_reflog, entrycount - 1, 1)); + cl_git_pass(git_reflog_drop(g_reflog, entrycount - 1, 1)); cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); entry = git_reflog_entry_byindex(g_reflog, entrycount - 2); @@ -102,10 +102,10 @@ void test_refs_reflog_drop__can_drop_all_the_entries(void) cl_assert(--entrycount > 0); do { - cl_git_pass(git_reflog_entry_drop(g_reflog, --entrycount, 1)); + cl_git_pass(git_reflog_drop(g_reflog, --entrycount, 1)); } while (entrycount > 0); - cl_git_pass(git_reflog_entry_drop(g_reflog, 0, 1)); + cl_git_pass(git_reflog_drop(g_reflog, 0, 1)); cl_assert_equal_i(0, git_reflog_entrycount(g_reflog)); } @@ -117,7 +117,7 @@ void test_refs_reflog_drop__can_persist_deletion_on_disk(void) cl_assert(entrycount > 2); cl_git_pass(git_reference_lookup(&ref, g_repo, g_reflog->ref_name)); - cl_git_pass(git_reflog_entry_drop(g_reflog, entrycount - 1, 1)); + cl_git_pass(git_reflog_drop(g_reflog, entrycount - 1, 1)); cl_assert_equal_i(entrycount - 1, git_reflog_entrycount(g_reflog)); cl_git_pass(git_reflog_write(g_reflog)); |