Commits

Anonymous committed be18f4b Merge

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

  • Participants
  • Parent commits 38b7ccb, acb0b7b

Comments (0)

Files changed (2)

 	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;
 
 case "$no_update_info" in
 t) : ;;
-*) git-update-server-info ;;
+*) git update-server-info ;;
 esac