summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-05 08:04:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-05 08:04:38 (GMT)
commitacb0b7b01f64cf55d508b469eb2a351359c0cd82 (patch)
tree90796d24196273c1c88e498a1a5797b3690a66d4
parentf054a419419337142ffe40433aa3984ccc000624 (diff)
parent4f6a32f8af9cceaf0c8ccf6d00d2f100dab5a6db (diff)
downloadgit-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
-rw-r--r--builtin-commit.c3
-rwxr-xr-xgit-repack.sh2
2 files changed, 3 insertions, 2 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;
diff --git a/git-repack.sh b/git-repack.sh
index be6db5e..00c597e 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