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 10, 2015 at 04:45 UTC
29957fda0b6a061c49792875f303570b4b451d62
1 file changed
+8
-4
refs.c
+8
-4
@@ -2799,8 +2799,9 @@ static int rename_ref_available(const char *oldname, const char *newname)
2799
return ret;
2800
}
2801
2802
-static int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1,
2803
- const char *logmsg);
2802
+static int write_ref_to_lockfile(struct ref_lock *lock, const unsigned char *sha1);
2803
+static int commit_ref_update(struct ref_lock *lock,
2804
+ const unsigned char *sha1, const char *logmsg);
2805
2806
int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg)
2807
{
@@ -2859,7 +2860,9 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
2860
}
2861
lock->force_write = 1;
2862
hashcpy(lock->old_sha1, orig_sha1);
2862
- if (write_ref_sha1(lock, orig_sha1, logmsg)) {
2863
+
2864
+ if (write_ref_to_lockfile(lock, orig_sha1) ||
2865
+ commit_ref_update(lock, orig_sha1, logmsg)) {
2866
error("unable to write current sha1 into %s", newrefname);
2867
goto rollback;
2868
}
@@ -2876,7 +2879,8 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
2879
lock->force_write = 1;
2880
flag = log_all_ref_updates;
2881
log_all_ref_updates = 0;
2879
- if (write_ref_sha1(lock, orig_sha1, NULL))
2882
+ if (write_ref_to_lockfile(lock, orig_sha1) ||
2883
+ commit_ref_update(lock, orig_sha1, NULL))
2884
error("unable to write current sha1 into %s", oldrefname);
2885
log_all_ref_updates = flag;
2886