summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorPeter Valdemar Mørch <peter@morch.com>2008-08-11 08:46:25 +0200
committerJunio C Hamano <gitster@pobox.com>2008-08-17 16:26:26 -0700
commit84102a338df08a365ed0336304322adc05bc1581 (patch)
tree22dfc5eed3a9039a26e5da1878a69b20134061e5 /log-tree.c
parent036d17feda327c509c712dd1054a12d067166667 (diff)
downloadgit-84102a338df08a365ed0336304322adc05bc1581.tar.gz
Teach git log --exit-code 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 'log-tree.c')
-rw-r--r--log-tree.c2
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? */