Skip to content

Commit

Permalink
rename_ref(): inline calls to write_ref_sha1() from this function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed May 13, 2015
1 parent 38e50e8 commit 29957fd
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -2799,8 +2799,9 @@ static int rename_ref_available(const char *oldname, const char *newname)
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)
{
Expand Down Expand Up @@ -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);
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;
}
Expand All @@ -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;
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;

Expand Down

0 comments on commit 29957fd

Please sign in to comment.