commit_ref_update(): remove the flags parameter
commit_ref_update() is now only called with flags=0. So remove the flags parameter entirely. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Michael Haggerty committed
Apr 22, 2016 at 14:38 UTC
5d9b2de4ef5a6b0cc38bbb3affcc614a66c663d7
1 file changed
+7
-7
refs/files-backend.c
+7
-7
@@ -2546,7 +2546,7 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
2546
const unsigned char *sha1, struct strbuf *err);
2547
static int commit_ref_update(struct ref_lock *lock,
2548
const unsigned char *sha1, const char *logmsg,
2549
- int flags, struct strbuf *err);
2549
+ struct strbuf *err);
2550
2551
int rename_ref(const char *oldrefname, const char *newrefname, const char *logmsg)
2552
{
@@ -2622,7 +2622,7 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
2622
hashcpy(lock->old_oid.hash, orig_sha1);
2623
2624
if (write_ref_to_lockfile(lock, orig_sha1, &err) ||
2625
- commit_ref_update(lock, orig_sha1, logmsg, 0, &err)) {
2625
+ commit_ref_update(lock, orig_sha1, logmsg, &err)) {
2626
error("unable to write current sha1 into %s: %s", newrefname, err.buf);
2627
strbuf_release(&err);
2628
goto rollback;
@@ -2642,7 +2642,7 @@ int rename_ref(const char *oldrefname, const char *newrefname, const char *logms
2642
flag = log_all_ref_updates;
2643
log_all_ref_updates = 0;
2644
if (write_ref_to_lockfile(lock, orig_sha1, &err) ||
2645
- commit_ref_update(lock, orig_sha1, NULL, 0, &err)) {
2645
+ commit_ref_update(lock, orig_sha1, NULL, &err)) {
2646
error("unable to write current sha1 into %s: %s", oldrefname, err.buf);
2647
strbuf_release(&err);
2648
}
@@ -2880,12 +2880,12 @@ static int write_ref_to_lockfile(struct ref_lock *lock,
2880
*/
2881
static int commit_ref_update(struct ref_lock *lock,
2882
const unsigned char *sha1, const char *logmsg,
2883
- int flags, struct strbuf *err)
2883
+ struct strbuf *err)
2884
{
2885
clear_loose_ref_cache(&ref_cache);
2886
- if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0 ||
2886
+ if (log_ref_write(lock->ref_name, lock->old_oid.hash, sha1, logmsg, 0, err) < 0 ||
2887
(strcmp(lock->ref_name, lock->orig_ref_name) &&
2888
- log_ref_write(lock->orig_ref_name, lock->old_oid.hash, sha1, logmsg, flags, err) < 0)) {
2888
+ log_ref_write(lock->orig_ref_name, lock->old_oid.hash, sha1, logmsg, 0, err) < 0)) {
2889
char *old_msg = strbuf_detach(err, NULL);
2890
strbuf_addf(err, "cannot update the ref '%s': %s",
2891
lock->ref_name, old_msg);
@@ -2921,7 +2921,7 @@ static int commit_ref_update(struct ref_lock *lock,
2921
}
2922
}
2923
}
2924
- if (!(flags & REF_LOG_ONLY) && commit_ref(lock)) {
2924
+ if (commit_ref(lock)) {
2925
strbuf_addf(err, "couldn't set '%s'", lock->ref_name);
2926
unlock_ref(lock);
2927
return -1;