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 /rerere.c | |
parent | f5637549a7eb93883839de01399418e10bf81768 (diff) | |
download | git-acd3b9eca82e38950f94e4708b528b7dae09a7c8.tar.gz |
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 'rerere.c')
-rw-r--r-- | rerere.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -346,7 +346,8 @@ int setup_rerere(struct string_list *merge_rr) return -1; merge_rr_path = xstrdup(git_path("MERGE_RR")); - fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1); + fd = hold_lock_file_for_update(&write_lock, merge_rr_path, + LOCK_DIE_ON_ERROR); read_rr(merge_rr); return fd; } |