log_ref_write(): inline function
This function doesn't do anything beyond call files_log_ref_write(), so replace it with the latter at its call sites. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Jan 6, 2017 at 17:22 UTC
81b1b6d4ff5dea059c2120819f5cffcd915dff2e
1 file changed
+10
-14
refs/files-backend.c
+10
-14
@@ -2832,14 +2832,6 @@ static int log_ref_write_1(const char *refname, const unsigned char *old_sha1,
2832
return 0;
2833
}
2834
2835
-static int log_ref_write(const char *refname, const unsigned char *old_sha1,
2836
- const unsigned char *new_sha1, const char *msg,
2837
- int flags, struct strbuf *err)
2838
-{
2839
- return files_log_ref_write(refname, old_sha1, new_sha1, msg, flags,
2840
- err);
2841
-}
2842
-
2835
int files_log_ref_write(const char *refname, const unsigned char *old_sha1,
2836
const unsigned char *new_sha1, const char *msg,
2837
int flags, struct strbuf *err)
@@ -2903,7 +2895,8 @@ static int commit_ref_update(struct files_ref_store *refs,
2895
assert_main_repository(&refs->base, "commit_ref_update");
2896
2897
clear_loose_ref_cache(refs);
2906
- if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, 0, err)) {
2898
+ if (files_log_ref_write(lock->ref_name, lock->old_oid.hash, sha1,
2899
+ logmsg, 0, err)) {
2900
char *old_msg = strbuf_detach(err, NULL);
2901
strbuf_addf(err, "cannot update the ref '%s': %s",
2902
lock->ref_name, old_msg);
@@ -2934,7 +2927,7 @@ static int commit_ref_update(struct files_ref_store *refs,
2927
if (head_ref && (head_flag & REF_ISSYMREF) &&
2928
!strcmp(head_ref, lock->ref_name)) {
2929
struct strbuf log_err = STRBUF_INIT;
2937
- if (log_ref_write("HEAD", lock->old_oid.hash, sha1,
2930
+ if (files_log_ref_write("HEAD", lock->old_oid.hash, sha1,
2931
logmsg, 0, &log_err)) {
2932
error("%s", log_err.buf);
2933
strbuf_release(&log_err);
@@ -2973,7 +2966,8 @@ static void update_symref_reflog(struct ref_lock *lock, const char *refname,
2966
struct strbuf err = STRBUF_INIT;
2967
unsigned char new_sha1[20];
2968
if (logmsg && !read_ref(target, new_sha1) &&
2976
- log_ref_write(refname, lock->old_oid.hash, new_sha1, logmsg, 0, &err)) {
2969
+ files_log_ref_write(refname, lock->old_oid.hash, new_sha1,
2970
+ logmsg, 0, &err)) {
2971
error("%s", err.buf);
2972
strbuf_release(&err);
2973
}
@@ -3748,9 +3742,11 @@ static int files_transaction_commit(struct ref_store *ref_store,
3742
3743
if (update->flags & REF_NEEDS_COMMIT ||
3744
update->flags & REF_LOG_ONLY) {
3751
- if (log_ref_write(lock->ref_name, lock->old_oid.hash,
3752
- update->new_sha1,
3753
- update->msg, update->flags, err)) {
3745
+ if (files_log_ref_write(lock->ref_name,
3746
+ lock->old_oid.hash,
3747
+ update->new_sha1,
3748
+ update->msg, update->flags,
3749
+ err)) {
3750
char *old_msg = strbuf_detach(err, NULL);
3751
3752
strbuf_addf(err, "cannot update the ref '%s': %s",