Merge branch 'maint-1.6.1' into maint

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

diff --combined builtin-commit.c
index 46e649cd7ca0a2ede8f010a6d3bf294f81b85d55,72dd0b95531cc8024ea106b14bbe847e956d308c..81371b1d2698a48dba36046d7ff9d849f830a762
--- 1/builtin-commit.c
--- 2/builtin-commit.c
+++ b/builtin-commit.c
@@@ -166,7 -166,7 +166,7 @@@ static int list_paths(struct string_lis
                struct cache_entry *ce = active_cache[i];
                if (ce->ce_flags & CE_UPDATE)
                        continue;
 -              if (!pathspec_match(pattern, m, ce->name, 0))
 +              if (!match_pathspec(pattern, ce->name, ce_namelen(ce), 0, m))
                        continue;
                string_list_insert(ce->name, list);
        }
@@@ -224,7 -224,8 +224,8 @@@ 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_preload(NULL) < 0)
                        die("index file corrupt");
                commit_style = COMMIT_AS_IS;
@@@ -361,6 -362,40 +362,6 @@@ static int run_status(FILE *fp, const c
        return s.commitable;
  }
  
 -static int run_hook(const char *index_file, const char *name, ...)
 -{
 -      struct child_process hook;
 -      const char *argv[10], *env[2];
 -      char index[PATH_MAX];
 -      va_list args;
 -      int i;
 -
 -      va_start(args, name);
 -      argv[0] = git_path("hooks/%s", name);
 -      i = 0;
 -      do {
 -              if (++i >= ARRAY_SIZE(argv))
 -                      die ("run_hook(): too many arguments");
 -              argv[i] = va_arg(args, const char *);
 -      } while (argv[i]);
 -      va_end(args);
 -
 -      snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", index_file);
 -      env[0] = index;
 -      env[1] = NULL;
 -
 -      if (access(argv[0], X_OK) < 0)
 -              return 0;
 -
 -      memset(&hook, 0, sizeof(hook));
 -      hook.argv = argv;
 -      hook.no_stdin = 1;
 -      hook.stdout_to_stderr = 1;
 -      hook.env = env;
 -
 -      return run_command(&hook);
 -}
 -
  static int is_a_merge(const unsigned char *sha1)
  {
        struct commit *commit = lookup_commit(sha1);
@@@ -561,6 -596,7 +562,6 @@@ static int prepare_to_commit(const cha
                commitable = run_status(fp, index_file, prefix, 1);
                wt_status_use_color = saved_color_setting;
        } else {
 -              struct rev_info rev;
                unsigned char sha1[20];
                const char *parent = "HEAD";
  
@@@ -572,8 -608,16 +573,8 @@@
  
                if (get_sha1(parent, sha1))
                        commitable = !!active_nr;
 -              else {
 -                      init_revisions(&rev, "");
 -                      rev.abbrev = 0;
 -                      setup_revisions(0, NULL, &rev, parent);
 -                      DIFF_OPT_SET(&rev.diffopt, QUIET);
 -                      DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
 -                      run_diff_index(&rev, 1 /* cached */);
 -
 -                      commitable = !!DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES);
 -              }
 +              else
 +                      commitable = index_differs_from(parent, 0);
        }
  
        fclose(fp);
@@@ -840,7 -884,7 +841,7 @@@ static void print_summary(const char *p
  {
        struct rev_info rev;
        struct commit *commit;
 -      static const char *format = "format:%h: \"%s\"";
 +      static const char *format = "format:%h] %s";
        unsigned char junk_sha1[20];
        const char *head = resolve_ref("HEAD", junk_sha1, 0, NULL);
  
@@@ -867,7 -911,7 +868,7 @@@
        rev.diffopt.break_opt = 0;
        diff_setup_done(&rev.diffopt);
  
 -      printf("[%s%s]: created ",
 +      printf("[%s%s ",
                !prefixcmp(head, "refs/heads/") ?
                        head + 11 :
                        !strcmp(head, "HEAD") ?