Re: [PATCH 2/3] merge: abort if fails to commit
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:38
Nguyễn Thái Ngọc Duy [off-list ref] writes:
quoted hunk
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- builtin/merge.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)diff --git a/builtin/merge.c b/builtin/merge.c index df4548a..e57eefa 100644 --- a/builtin/merge.c +++ b/builtin/merge.c@@ -913,7 +913,9 @@ static int merge_trivial(struct commit *head) parent->next->item = remoteheads->item; parent->next->next = NULL; prepare_to_commit(); - commit_tree(merge_msg.buf, merge_msg.len, result_tree, parent, result_commit, NULL); + if (commit_tree(merge_msg.buf, merge_msg.len, + result_tree, parent, result_commit, NULL)) + die(_("failed to write commit object")); finish(head, result_commit, "In-index merge"); drop_save(); return 0;
Should we die immediately, or should we do some clean-ups after ourselves before doing so? In any case, this is a good change that shouldn't be taken hostage to the unrelated change in patch [1/3]. Thanks.
quoted hunk
@@ -944,7 +946,9 @@ static int finish_automerge(struct commit *head, strbuf_addch(&merge_msg, '\n'); prepare_to_commit(); free_commit_list(remoteheads); - commit_tree(merge_msg.buf, merge_msg.len, result_tree, parents, result_commit, NULL); + if (commit_tree(merge_msg.buf, merge_msg.len, + result_tree, parents, result_commit, NULL)) + die(_("failed to write commit object")); strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy); finish(head, result_commit, buf.buf); strbuf_release(&buf);