summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorPeter Valdemar Mørch <peter@morch.com>2008-08-11 08:46:24 +0200
committerJunio C Hamano <gitster@pobox.com>2008-08-17 16:26:21 -0700
commit036d17feda327c509c712dd1054a12d067166667 (patch)
tree1e26fdccbd37ef4a01a73b8ab0d5bce4f387ee19 /builtin-log.c
parent2ebc02d32a4360da2cf69c2b5f5bfad0716d42b0 (diff)
downloadgit-036d17feda327c509c712dd1054a12d067166667.tar.gz
Teach git log --check to return an appropriate exit code
Signed-off-by: Peter Valdemar Mørch <peter@morch.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c9
1 files changed, 9 insertions, 0 deletions
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;
}