rename_ref(): inline calls to write_ref_sha1() from this function

Most of what it does is unneeded from these call sites.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/refs.c b/refs.c
index 7661db95631cae845823b719460e9e593dc9d65e..18ce8e6e897c08b21d604cd91f55dbcb7a5972d6 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -2799,8 +2799,9 @@ static int rename_ref_available(const char *oldname, const char *newname)
        return ret;
 }
 
        return ret;
 }
 

-static int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1,
-                         const char *logmsg);
+static int write_ref_to_lockfile(struct ref_lock *lock, const unsigned char *sha1);
+static int commit_ref_update(struct ref_lock *lock,
+                            const unsigned char *sha1, const char *logmsg);

 
 int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg)
 {
 
 int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg)
 {


@@ -2859,7 +2860,9 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
        }
        lock->force_write = 1;
        hashcpy(lock->old_sha1, orig_sha1);
        }
        lock->force_write = 1;
        hashcpy(lock->old_sha1, orig_sha1);

-       if (write_ref_sha1(lock, orig_sha1, logmsg)) {
+
+       if (write_ref_to_lockfile(lock, orig_sha1) ||
+           commit_ref_update(lock, orig_sha1, logmsg)) {

                error("unable to write current sha1 into %s", newrefname);
                goto rollback;
        }
                error("unable to write current sha1 into %s", newrefname);
                goto rollback;
        }


@@ -2876,7 +2879,8 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
        lock->force_write = 1;
        flag = log_all_ref_updates;
        log_all_ref_updates = 0;
        lock->force_write = 1;
        flag = log_all_ref_updates;
        log_all_ref_updates = 0;

-       if (write_ref_sha1(lock, orig_sha1, NULL))
+       if (write_ref_to_lockfile(lock, orig_sha1) ||
+           commit_ref_update(lock, orig_sha1, NULL))

                error("unable to write current sha1 into %s", oldrefname);
        log_all_ref_updates = flag;
 
                error("unable to write current sha1 into %s", oldrefname);
        log_all_ref_updates = flag;