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

Teach git log --exit-code 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>
上级 036d17fe
......@@ -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)
......
......@@ -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? */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册