merge: abort if fails to commit
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Dec 15, 2011 at 20:47 UTC
6b3c4c05475d206fafd650d8d27c82a8b051ac30
1 file changed
+4
-2
builtin/merge.c
+4
-2
@@ -913,7 +913,8 @@ static int merge_trivial(struct commit *head)
913
parent->next->item = remoteheads->item;
914
parent->next->next = NULL;
915
prepare_to_commit();
916
- commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL);
916
+ if (commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL))
917
+ die(_("failed to write commit object"));
918
finish(head, result_commit, "In-index merge");
919
drop_save();
920
return 0;
@@ -944,7 +945,8 @@ static int finish_automerge(struct commit *head,
945
strbuf_addch(&merge_msg, '\n');
946
prepare_to_commit();
947
free_commit_list(remoteheads);
947
- commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
948
+ if (commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL))
949
+ die(_("failed to write commit object"));
950
strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
951
finish(head, result_commit, buf.buf);
952
strbuf_release(&buf);