Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  commit: abort commit if interactive add failed
  git-repack: use non-dashed update-server-info

Conflicts:
	builtin-commit.c

diff --cc builtin-commit.c
index 2f0b00a174ff970939d2758334cb8d1dca41cb42,fde7b891d9d015acfeb1ee3b9ab42ff1eafd49b6..72dd0b95531cc8024ea106b14bbe847e956d308c
--- 1/builtin-commit.c
--- 2/builtin-commit.c
+++ b/builtin-commit.c
@@@ -224,8 -224,9 +224,9 @@@ static char *prepare_index(int argc, co
        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)
 +              if (read_cache_preload(NULL) < 0)
                        die("index file corrupt");
                commit_style = COMMIT_AS_IS;
                return get_index_file();