Merge branch 'jc/maint-co-track' into maint

diff --git a/builtin-revert.c b/builtin-revert.c
index c41788685bf0b5bea3a3ae26615795e07a995793..786a956f26486856c97e15ce8ab464dfb25dcbc5 100644 (file)
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -338,7 +338,8 @@ static int revert_or_cherry_pick(int argc, const char **argv)
         * reverse of it if we are revert.
         */
 
-       msg_fd = hold_lock_file_for_update(&msg_file, defmsg, 1);
+       msg_fd = hold_lock_file_for_update(&msg_file, defmsg,
+                                          LOCK_DIE_ON_ERROR);
 
        encoding = get_encoding(message);
        if (!encoding)