Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/builtin-update-ref.c b/builtin-update-ref.c
index 1461937cb987ec18a0b91e7c1084063c7174f3ae..5ee960bf41c4518b6c5530acb123a7ed668538fc 100644 (file)
--- a/builtin-update-ref.c
+++ b/builtin-update-ref.c
@@ -61,10 +61,8 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 
        lock = lock_any_ref_for_update(refname, oldval ? oldsha1 : NULL);
        if (!lock)
-               return 1;
+               die("%s: cannot lock the ref", refname);
        if (write_ref_sha1(lock, sha1, msg) < 0)
-               return 1;
-
-       /* write_ref_sha1 always unlocks the ref, no need to do it explicitly */
+               die("%s: cannot update the ref", refname);
        return 0;
 }