提交 036d17fe 编写于 作者: P Peter Valdemar Mørch 提交者: Junio C Hamano

Teach git log --check to return an appropriate exit code

Signed-off-by: NPeter Valdemar Mørch <peter@morch.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 2ebc02d3
......@@ -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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册