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 --git a/builtin-commit.c b/builtin-commit.c
index 2f0b00a174ff970939d2758334cb8d1dca41cb42..72dd0b95531cc8024ea106b14bbe847e956d308c 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;

diff --git a/git-repack.sh b/git-repack.sh
index be6db5e805d62e0440f7de3c1f6ee3fcd16a2ed3..00c597e97c8fd5a97105d2c68315cef414175669 100755 (executable)
--- a/git-repack.sh
+++ b/git-repack.sh
@@ -181,5 +181,5 @@ fi
 
 case "$no_update_info" in
 t) : ;;
-*) git-update-server-info ;;
+*) git update-server-info ;;
 esac