microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

sequencer: make lockfiles non-static 

After 076aa2cbd (tempfile: auto-allocate tempfiles on heap, 2017-09-05),
we can have lockfiles on the stack.

One of these functions fails to always roll back the lock. That will be
fixed in the next commit.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin Ågren 2018-02-27 22:30:09 +01:00 коммит произвёл Junio C Hamano
Родитель e3a80781f5
Коммит 14bca6c63c
1 изменённых файлов: 5 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
sequencer.c
Просмотреть файл

@ -339,7 +339,7 @@ static void print_advice(int show_hint, struct replay_opts *opts)
static int write_message(const void *buf, size_t len, const char *filename, static int write_message(const void *buf, size_t len, const char *filename,
int append_eol) int append_eol)
{ {
static struct lock_file msg_file; struct lock_file msg_file = LOCK_INIT;
int msg_fd = hold_lock_file_for_update(&msg_file, filename, 0); int msg_fd = hold_lock_file_for_update(&msg_file, filename, 0);
if (msg_fd < 0) if (msg_fd < 0)
@ -485,7 +485,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
struct tree *result, *next_tree, *base_tree, *head_tree; struct tree *result, *next_tree, *base_tree, *head_tree;
int clean; int clean;
char **xopt; char **xopt;
static struct lock_file index_lock; struct lock_file index_lock = LOCK_INIT;
if (hold_locked_index(&index_lock, LOCK_REPORT_ON_ERROR) < 0) if (hold_locked_index(&index_lock, LOCK_REPORT_ON_ERROR) < 0)
return -1; return -1;
@ -1705,7 +1705,7 @@ static int prepare_revs(struct replay_opts *opts)
static int read_and_refresh_cache(struct replay_opts *opts) static int read_and_refresh_cache(struct replay_opts *opts)
{ {
static struct lock_file index_lock; struct lock_file index_lock = LOCK_INIT;
int index_fd = hold_locked_index(&index_lock, 0); int index_fd = hold_locked_index(&index_lock, 0);
if (read_index_preload(&the_index, NULL) < 0) { if (read_index_preload(&the_index, NULL) < 0) {
rollback_lock_file(&index_lock); rollback_lock_file(&index_lock);
@ -2099,7 +2099,7 @@ static int create_seq_dir(void)
static int save_head(const char *head) static int save_head(const char *head)
{ {
static struct lock_file head_lock; struct lock_file head_lock = LOCK_INIT;
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
int fd; int fd;
ssize_t written; ssize_t written;
@ -2224,7 +2224,7 @@ fail:
static int save_todo(struct todo_list *todo_list, struct replay_opts *opts) static int save_todo(struct todo_list *todo_list, struct replay_opts *opts)
{ {
static struct lock_file todo_lock; struct lock_file todo_lock = LOCK_INIT;
const char *todo_path = get_todo_path(opts); const char *todo_path = get_todo_path(opts);
int next = todo_list->current, offset, fd; int next = todo_list->current, offset, fd;