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>
Michael Haggerty committed
May 9, 2015 at 17:20 UTC
ba43b7f29c59f75cf5f28af3a02d16c08937e439
1 file changed
+8
-4
refs.c
+8
-4
@@ -2773,8 +2773,9 @@ static int rename_ref_available(const char *oldname, const char *newname)
2773
return ret;
2774
}
2775
2776
-static int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1,
2777
- const char *logmsg);
2776
+static int write_ref_to_lockfile(struct ref_lock *lock, const unsigned char *sha1);
2777
+static int commit_ref_update(struct ref_lock *lock,
2778
+ const unsigned char *sha1, const char *logmsg);
2779
2780
int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg)
2781
{
@@ -2832,7 +2833,9 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
2833
goto rollback;
2834
}
2835
hashcpy(lock->old_sha1, orig_sha1);
2835
- if (write_ref_sha1(lock, orig_sha1, logmsg)) {
2836
+
2837
+ if (write_ref_to_lockfile(lock, orig_sha1) ||
2838
+ commit_ref_update(lock, orig_sha1, logmsg)) {
2839
error("unable to write current sha1 into %s", newrefname);
2840
goto rollback;
2841
}
@@ -2848,7 +2851,8 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
2851
2852
flag = log_all_ref_updates;
2853
log_all_ref_updates = 0;
2851
- if (write_ref_sha1(lock, orig_sha1, NULL))
2854
+ if (write_ref_to_lockfile(lock, orig_sha1) ||
2855
+ commit_ref_update(lock, orig_sha1, NULL))
2856
error("unable to write current sha1 into %s", oldrefname);
2857
log_all_ref_updates = flag;
2858