Change xdl_merge to generate output even for null merges

diff --git a/builtin-commit.c b/builtin-commit.c
index 1e08399919fb40f710236d223c12528648e6f40a..fde7b891d9d015acfeb1ee3b9ab42ff1eafd49b6 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -224,7 +224,8 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
        const char **pathspec = NULL;
 
        if (interactive) {
-               interactive_add(argc, argv, prefix);
+               if (interactive_add(argc, argv, prefix) != 0)
+                       die("interactive add failed");
                if (read_cache() < 0)
                        die("index file corrupt");
                commit_style = COMMIT_AS_IS;
@@ -625,7 +626,6 @@ static int prepare_to_commit(const char *index_file, const char *prefix)
        if (!commitable && !in_merge && !allow_empty &&
            !(amend && is_a_merge(head_sha1))) {
                run_status(stdout, index_file, prefix, 0);
-               unlink(commit_editmsg);
                return 0;
        }