summaryrefslogtreecommitdiff
path: root/builtin-diff-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-13 23:40:27 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-13 23:40:27 -0800
commitda31b358fb39b32622c14343ffe157a765f3948b (patch)
treef995bc40d7685b5d342e9d60a99a4152a55cf2cd /builtin-diff-tree.c
parent62c64895cfcf3bbf34969a69fa96a631f7d5b14e (diff)
downloadgit-da31b358fb39b32622c14343ffe157a765f3948b.tar.gz
diff --check: minor fixups
There is no reason --exit-code and --check-diff must be mutually exclusive, so assign different bits to different results and allow them to be returned from the command. Introduce diff_result_code() to factor out the common code to decide final status code based on diffopt settings and use it everywhere. Update tests to match the above fix. Turning pager off when "diff --check" is used is a regression. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-diff-tree.c')
-rw-r--r--builtin-diff-tree.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index 9ab90cb4c5..ebc50efbd2 100644
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -132,8 +132,6 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
diff_tree_stdin(line);
}
}
- if (opt->diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
- return DIFF_OPT_TST(&opt->diffopt, CHECK_FAILED) != 0;
- return DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS)
- && DIFF_OPT_TST(&opt->diffopt, HAS_CHANGES);
+
+ return diff_result_code(&opt->diffopt, 0);
}