On Fri, May 16, 2014 at 3:54 PM, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: > Ronnie Sahlberg wrote: > >> --- a/builtin/fetch.c >> +++ b/builtin/fetch.c > [...] >> @@ -384,15 +384,16 @@ static int s_update_ref(const char *action, >> snprintf(msg, sizeof(msg), "%s: %s", rla, action); >> >> errno = 0; >> - lock = lock_any_ref_for_update(ref->name, >> - check_old ? ref->old_sha1 : NULL, >> - 0, NULL); >> - if (!lock) >> - return errno == ENOTDIR ? STORE_REF_ERROR_DF_CONFLICT : >> - STORE_REF_ERROR_OTHER; >> - if (write_ref_sha1(lock, ref->new_sha1, msg) < 0) >> + transaction = ref_transaction_begin(); >> + if (!transaction || >> + ref_transaction_update(transaction, ref->name, ref->new_sha1, >> + ref->old_sha1, 0, check_old) || >> + ref_transaction_commit(transaction, msg, NULL)) { > > Since 'err' is NULL, does that mean there's no message shown to the > user on error? Yes. Updated in the ref-transactions branch. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html