diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:17:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:17:08 -0700 |
| commit | 81aa96497686bd31c5a9a3cdf110c2e10c799c03 (patch) | |
| tree | 58e9c7e1f74d2d002ca8cc0c59eec8ade805f9f5 /builtin-commit.c | |
| parent | 5dba35912474770d0df45ed801d78c4c9ed5e949 (diff) | |
| parent | 835a3eea3e18695e29b1d4c3adca37d1caaa16ef (diff) | |
| download | git-81aa96497686bd31c5a9a3cdf110c2e10c799c03.tar.xz | |
Merge branch 'maint'
* maint:
git submodule: fix usage line
doc/git-pack-refs: fix two grammar issues
commit: abort commit if interactive add failed
git-repack: use non-dashed update-server-info
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 46e649cd7c..81371b1d26 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; |