Change xdl_merge to generate output even for null merges

diff --git a/builtin-commit.c b/builtin-commit.c
index 6cbdd55f168507259a17b64a19ad29310c6d3397..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;