diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-05 08:04:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-05 08:04:38 (GMT) |
| commit | acb0b7b01f64cf55d508b469eb2a351359c0cd82 (patch) | |
| tree | 90796d24196273c1c88e498a1a5797b3690a66d4 /builtin-commit.c | |
| parent | f054a419419337142ffe40433aa3984ccc000624 (diff) | |
| parent | 4f6a32f8af9cceaf0c8ccf6d00d2f100dab5a6db (diff) | |
| download | git-acb0b7b01f64cf55d508b469eb2a351359c0cd82.zip git-acb0b7b01f64cf55d508b469eb2a351359c0cd82.tar.gz git-acb0b7b01f64cf55d508b469eb2a351359c0cd82.tar.bz2 | |
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
Diffstat (limited to 'builtin-commit.c')
| -rw-r--r-- | builtin-commit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 2f0b00a..72dd0b9 100644 --- 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; |