diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-17 15:44:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-19 12:35:37 -0700 |
| commit | acd3b9eca82e38950f94e4708b528b7dae09a7c8 (patch) | |
| tree | f341dae377b97e9c7fd9746208be0fee56bda438 /builtin-revert.c | |
| parent | f5637549a7eb93883839de01399418e10bf81768 (diff) | |
| download | git-acd3b9eca82e38950f94e4708b528b7dae09a7c8.tar.gz git-acd3b9eca82e38950f94e4708b528b7dae09a7c8.tar.xz | |
Enhance hold_lock_file_for_{update,append}() API
This changes the "die_on_error" boolean parameter to a mere "flags", and
changes the existing callers of hold_lock_file_for_update/append()
functions to pass LOCK_DIE_ON_ERROR.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-revert.c')
| -rw-r--r-- | builtin-revert.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) |