From e1dc49bcdefd362e129c9ee3a85527b518f9b49d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 4 Apr 2009 11:59:55 -0500 Subject: git-repack: use non-dashed update-server-info Signed-off-by: Dan McGee Signed-off-by: Junio C Hamano --- git-repack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-repack.sh b/git-repack.sh index be6db5e80..00c597e97 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 -- cgit v1.2.1 From 4f6a32f8af9cceaf0c8ccf6d00d2f100dab5a6db Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 3 Apr 2009 15:28:56 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- builtin-commit.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin-commit.c b/builtin-commit.c index 6cbdd55f1..fde7b891d 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() < 0) die("index file corrupt"); commit_style = COMMIT_AS_IS; -- cgit v1.2.1