Commit 13c9e44af9424e1fc478693f0d64fbf7082c9665
2013-11-14T19:41:09
reflog: remove git_reflog_append_to() This was a convenience method for the refs front-end to do the reflog writing. This is now done in the backend and it has no more reason for being.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
diff --git a/include/git2/reflog.h b/include/git2/reflog.h
index 2d1b6ee..df06e1b 100644
--- a/include/git2/reflog.h
+++ b/include/git2/reflog.h
@@ -47,7 +47,7 @@ GIT_EXTERN(int) git_reflog_read(git_reflog **out, git_repository *repo, const c
GIT_EXTERN(int) git_reflog_write(git_reflog *reflog);
/**
- * Add a new entry to the reflog.
+ * Add a new entry to the in-memory reflog.
*
* `msg` is optional and can be NULL.
*
@@ -60,23 +60,6 @@ GIT_EXTERN(int) git_reflog_write(git_reflog *reflog);
GIT_EXTERN(int) git_reflog_append(git_reflog *reflog, const git_oid *id, const git_signature *committer, const char *msg);
/**
- * Add a new entry to the named reflog.
- *
- * This utility function loads the named reflog, appends to it and
- * writes it back out to the backend.
- *
- * `msg` is optional and can be NULL.
- *
- * @param repo the repository to act on
- * @param name the reflog's name
- * @param id the OID the reference is now pointing to
- * @param committer the signature of the committer
- * @param msg the reflog message
- * @return 0 or an error code
- */
-GIT_EXTERN(int) git_reflog_append_to(git_repository *repo, const char *name, const git_oid *id, const git_signature *committer, const char *msg);
-
-/**
* Rename a reflog
*
* The reflog to be renamed is expected to already exist
diff --git a/src/reflog.c b/src/reflog.c
index cebb87d..9b2b201 100644
--- a/src/reflog.c
+++ b/src/reflog.c
@@ -230,22 +230,3 @@ int git_reflog_drop(git_reflog *reflog, size_t idx, int rewrite_previous_entry)
return 0;
}
-
-int git_reflog_append_to(git_repository *repo, const char *name, const git_oid *id,
- const git_signature *committer, const char *msg)
-{
- int error;
- git_reflog *reflog;
-
- if ((error = git_reflog_read(&reflog, repo, name)) < 0)
- return error;
-
- if ((error = git_reflog_append(reflog, id, committer, msg)) < 0)
- goto cleanup;
-
- error = git_reflog_write(reflog);
-
-cleanup:
- git_reflog_free(reflog);
- return error;
-}
diff --git a/tests/refs/reflog/reflog.c b/tests/refs/reflog/reflog.c
index 6008579..9ac15d5 100644
--- a/tests/refs/reflog/reflog.c
+++ b/tests/refs/reflog/reflog.c
@@ -100,29 +100,6 @@ void test_refs_reflog_reflog__append_then_read(void)
git_signature_free(committer);
}
-void test_refs_reflog_reflog__append_to_then_read(void)
-{
- /* write a reflog for a given reference and ensure it can be read back */
- git_reference *ref;
- git_oid oid;
- git_signature *committer;
-
- /* Create a new branch pointing at the HEAD */
- git_oid_fromstr(&oid, current_master_tip);
- cl_git_pass(git_reference_create(&ref, g_repo, new_ref, &oid, 0));
- git_reference_free(ref);
-
- cl_git_pass(git_signature_now(&committer, "foo", "foo@bar"));
-
- cl_git_fail(git_reflog_append_to(g_repo, new_ref, &oid, committer, "no inner\nnewline"));
- cl_git_pass(git_reflog_append_to(g_repo, new_ref, &oid, committer, NULL));
- cl_git_pass(git_reflog_append_to(g_repo, new_ref, &oid, committer, commit_msg "\n"));
-
- assert_appends(committer, &oid);
-
- git_signature_free(committer);
-}
-
void test_refs_reflog_reflog__renaming_the_reference_moves_the_reflog(void)
{
git_reference *master, *new_master;