cygwin: Use native Win32 API for stat

diff --git a/builtin-merge.c b/builtin-merge.c
index b857cf6246978846e0c19895fd6f66266cf6a6f4..5c65a5869900ad1a1014fb3aad88c874a5410bf7 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -477,6 +477,8 @@ static int git_merge_config(const char *k, const char *v, void *cb)
 
                buf = xstrdup(v);
                argc = split_cmdline(buf, &argv);
+               if (argc < 0)
+                       die("Bad branch.%s.mergeoptions string", branch);
                argv = xrealloc(argv, sizeof(*argv) * (argc + 2));
                memmove(argv + 1, argv, sizeof(*argv) * (argc + 1));
                argc++;
@@ -576,6 +578,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
                                (write_cache(index_fd, active_cache, active_nr) ||
                                 commit_locked_index(lock)))
                        die ("unable to write %s", get_index_file());
+               rollback_lock_file(lock);
                return clean ? 0 : 1;
        } else {
                args = xmalloc((4 + commit_list_count(common) +
@@ -728,7 +731,7 @@ static int merge_trivial(void)
        parent->next = xmalloc(sizeof(struct commit_list *));
        parent->next->item = remoteheads->item;
        parent->next->next = NULL;
-       commit_tree(merge_msg.buf, result_tree, parent, result_commit);
+       commit_tree(merge_msg.buf, result_tree, parent, result_commit, NULL);
        finish(result_commit, "In-index merge");
        drop_save();
        return 0;
@@ -757,7 +760,7 @@ static int finish_automerge(struct commit_list *common,
        }
        free_commit_list(remoteheads);
        strbuf_addch(&merge_msg, '\n');
-       commit_tree(merge_msg.buf, result_tree, parents, result_commit);
+       commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
        strbuf_addf(&buf, "Merge made by %s.", wt_strategy);
        finish(result_commit, buf.buf);
        strbuf_release(&buf);