зеркало из https://github.com/microsoft/git.git
merge: always roll back lock in `checkout_fast_forward()`
This function originated in builtin/merge.c. It was moved to merge.c in
commit db699a8a1f
(Move try_merge_command and checkout_fast_forward to
libgit.a, 2012-10-26), but was used from sequencer.c even before that.
If a problem occurs, the function returns without rolling back the
lockfile. Teach it to do so.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
51d3f43d2f
Коммит
5790d25881
12
merge.c
12
merge.c
|
@ -113,17 +113,23 @@ int checkout_fast_forward(const struct object_id *head,
|
||||||
setup_unpack_trees_porcelain(&opts, "merge");
|
setup_unpack_trees_porcelain(&opts, "merge");
|
||||||
|
|
||||||
trees[nr_trees] = parse_tree_indirect(head);
|
trees[nr_trees] = parse_tree_indirect(head);
|
||||||
if (!trees[nr_trees++])
|
if (!trees[nr_trees++]) {
|
||||||
|
rollback_lock_file(&lock_file);
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
trees[nr_trees] = parse_tree_indirect(remote);
|
trees[nr_trees] = parse_tree_indirect(remote);
|
||||||
if (!trees[nr_trees++])
|
if (!trees[nr_trees++]) {
|
||||||
|
rollback_lock_file(&lock_file);
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
for (i = 0; i < nr_trees; i++) {
|
for (i = 0; i < nr_trees; i++) {
|
||||||
parse_tree(trees[i]);
|
parse_tree(trees[i]);
|
||||||
init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
|
init_tree_desc(t+i, trees[i]->buffer, trees[i]->size);
|
||||||
}
|
}
|
||||||
if (unpack_trees(nr_trees, t, &opts))
|
if (unpack_trees(nr_trees, t, &opts)) {
|
||||||
|
rollback_lock_file(&lock_file);
|
||||||
return -1;
|
return -1;
|
||||||
|
}
|
||||||
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
|
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
|
||||||
return error(_("unable to write new index file"));
|
return error(_("unable to write new index file"));
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче