X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-revert.c;h=e839387629461be24c0bf1dacaa3cdb48cb2a5f4;hb=acd3b9eca82e38950f94e4708b528b7dae09a7c8;hp=27881e94937dd79b9a0524eb2d9770427ec4f4fb;hpb=fc721b699b817e9cb78994c6dd6d86e744bd2112;p=git.git diff --git a/builtin-revert.c b/builtin-revert.c index 27881e949..e83938762 100644 --- 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)