Merge branch 'rj/maint-1.6.0-svn-parse-fix' into maint

diff --git a/builtin-commit.c b/builtin-commit.c
index 46e649cd7ca0a2ede8f010a6d3bf294f81b85d55..81371b1d2698a48dba36046d7ff9d849f830a762 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_preload(NULL) < 0)
                        die("index file corrupt");
                commit_style = COMMIT_AS_IS;