From 036d17feda327c509c712dd1054a12d067166667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Valdemar=20M=C3=B8rch?= Date: Mon, 11 Aug 2008 08:46:24 +0200 Subject: Teach git log --check to return an appropriate exit code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Valdemar Mørch Signed-off-by: Junio C Hamano --- builtin-log.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'builtin-log.c') diff --git a/builtin-log.c b/builtin-log.c index f4975cf35f..ae71540546 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -217,6 +217,11 @@ static int cmd_log_walk(struct rev_info *rev) if (rev->early_output) finish_early_output(rev); + /* + * For --check, the exit code is based on CHECK_FAILED being + * accumulated in rev->diffopt, so be careful to retain that state + * information if replacing rev->diffopt in this loop + */ while ((commit = get_revision(rev)) != NULL) { log_tree_commit(rev, commit); if (!rev->reflog_info) { @@ -227,6 +232,10 @@ static int cmd_log_walk(struct rev_info *rev) free_commit_list(commit->parents); commit->parents = NULL; } + if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF && + DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) { + return 02; + } return 0; } -- cgit v1.2.3 From 84102a338df08a365ed0336304322adc05bc1581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Valdemar=20M=C3=B8rch?= Date: Mon, 11 Aug 2008 08:46:25 +0200 Subject: Teach git log --exit-code to return an appropriate exit code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Valdemar Mørch Signed-off-by: Junio C Hamano --- builtin-log.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'builtin-log.c') diff --git a/builtin-log.c b/builtin-log.c index ae71540546..3a79574830 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -218,9 +218,9 @@ static int cmd_log_walk(struct rev_info *rev) finish_early_output(rev); /* - * For --check, the exit code is based on CHECK_FAILED being - * accumulated in rev->diffopt, so be careful to retain that state - * information if replacing rev->diffopt in this loop + * For --check and --exit-code, the exit code is based on CHECK_FAILED + * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to + * retain that state information if replacing rev->diffopt in this loop */ while ((commit = get_revision(rev)) != NULL) { log_tree_commit(rev, commit); @@ -236,7 +236,7 @@ static int cmd_log_walk(struct rev_info *rev) DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) { return 02; } - return 0; + return diff_result_code(&rev->diffopt, 0); } static int git_log_config(const char *var, const char *value, void *cb) -- cgit v1.2.3