Browse Source

commit: abort commit if interactive add failed

Previously we ignored the result of calling add_interactive,
which meant that if an error occurred we simply committed
whatever happened to be in the index.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 16 years ago committed by Junio C Hamano
parent
commit
4f6a32f8af
  1. 3
      builtin-commit.c

3
builtin-commit.c

@ -224,7 +224,8 @@ static char *prepare_index(int argc, const char **argv, const char *prefix) @@ -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() < 0)
die("index file corrupt");
commit_style = COMMIT_AS_IS;

Loading…
Cancel
Save