diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-20 23:42:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-20 23:42:29 -0700 |
| commit | 299c3714d433b0427a49a10977cc021c52f0aeb8 (patch) | |
| tree | 948fc0b4326e2ac0fa97968dc71e77fd94afebb3 /log-tree.c | |
| parent | 83a1abb37d2dc8ac18731bd53da9522e6641f0a1 (diff) | |
| parent | 84102a338df08a365ed0336304322adc05bc1581 (diff) | |
| download | git-299c3714d433b0427a49a10977cc021c52f0aeb8.tar.gz | |
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
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index bd8b9e45ab..30cd5bb228 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? */ |