From: Peter Valdemar Mørch Date: Mon, 11 Aug 2008 06:46:25 +0000 (+0200) Subject: Teach git log --exit-code to return an appropriate exit code X-Git-Tag: v1.6.1-rc1~326^2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=84102a338df08a365ed0336304322adc05bc1581;hp=036d17feda327c509c712dd1054a12d067166667;p=git.git Teach git log --exit-code to return an appropriate exit code Signed-off-by: Peter Valdemar Mørch Signed-off-by: Junio C Hamano --- diff --git a/builtin-log.c b/builtin-log.c index ae7154054..3a7957483 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) diff --git a/log-tree.c b/log-tree.c index bd8b9e45a..30cd5bb22 100644 --- a/log-tree.c +++ b/log-tree.c @@ -432,7 +432,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log struct commit_list *parents; unsigned const char *sha1 = commit->object.sha1; - if (!opt->diff) + if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS)) return 0; /* Root commit? */