[PATCH v2 2/2] Teach git log --exit-code to return an appropriate exit code
From: Peter Valdemar Mørch <peter@morch.com>
Signed-off-by: Peter Valdemar Mørch <peter@morch.com>
---
builtin-log.c | 8 ++++----
log-tree.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c
index ae71540..3a79574 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -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)
diff --git a/log-tree.c b/log-tree.c
index bd8b9e4..30cd5bb 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? */
--
1.6.0.rc2.5.g3452.dirty