undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Michael Haggerty 2015-05-09 17:20:39 +02:00 committed by Junio C Hamano
parent ad4cd6c297
commit ba43b7f29c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
refs.c
View File

@ -2773,8 +2773,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, static int write_ref_to_lockfile(struct ref_lock *lock, const unsigned char *sha1);
const char *logmsg); 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)
{ {
@ -2832,7 +2833,9 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
goto rollback; goto rollback;
} }
hashcpy(lock->old_sha1, orig_sha1); 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); error("unable to write current sha1 into %s", newrefname);
goto rollback; goto rollback;
} }
@ -2848,7 +2851,8 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
flag = log_all_ref_updates; flag = log_all_ref_updates;
log_all_ref_updates = 0; 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); error("unable to write current sha1 into %s", oldrefname);
log_all_ref_updates = flag; log_all_ref_updates = flag;