mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
Merge branch 'pm/log-exit-code'
* pm/log-exit-code: Teach git log --exit-code to return an appropriate exit code Teach git log --check to return an appropriate exit code
This commit is contained in:
commit
299c3714d4
2 changed files with 11 additions and 2 deletions
|
@ -217,6 +217,11 @@ static int cmd_log_walk(struct rev_info *rev)
|
|||
if (rev->early_output)
|
||||
finish_early_output(rev);
|
||||
|
||||
/*
|
||||
* 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);
|
||||
if (!rev->reflog_info) {
|
||||
|
@ -227,7 +232,11 @@ static int cmd_log_walk(struct rev_info *rev)
|
|||
free_commit_list(commit->parents);
|
||||
commit->parents = NULL;
|
||||
}
|
||||
return 0;
|
||||
if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
|
||||
DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
|
||||
return 02;
|
||||
}
|
||||
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? */
|
||||
|
|
Loading…
Reference in a new issue