diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:04:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-05 01:04:38 -0700 |
| commit | acb0b7b01f64cf55d508b469eb2a351359c0cd82 (patch) | |
| tree | 90796d24196273c1c88e498a1a5797b3690a66d4 | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| parent | commit: abort commit if interactive add failed (diff) | |
| download | tgif-acb0b7b01f64cf55d508b469eb2a351359c0cd82.tar.xz | |
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
| -rw-r--r-- | builtin-commit.c | 3 | ||||
| -rwxr-xr-x | git-repack.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 2f0b00a174..72dd0b9553 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; diff --git a/git-repack.sh b/git-repack.sh index be6db5e805..00c597e97c 100755 --- 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 |