diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-18 15:48:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-18 15:48:06 -0700 |
| commit | d54fe394acbad36e9d0fd960d5e10f2769a8041b (patch) | |
| tree | ffd71f86a9a602f4b52d2e518a530d5a2de2921f /builtin-diff-tree.c | |
| parent | 304de2d2d6afc7500fe9b8f2e22dd0a16a902d8b (diff) | |
| parent | 0c66d6be4f888096865b8f3d5fdc00c83e4ecc3f (diff) | |
| download | git-d54fe394acbad36e9d0fd960d5e10f2769a8041b.tar.gz | |
Merge branch 'ar/diff'
* ar/diff:
Add tests for --quiet option of diff programs
try-to-simplify-commit: use diff-tree --quiet machinery.
revision.c: explain what tree_difference does
Teach --quiet to diff backends.
diff --quiet
Remove unused diffcore_std_no_resolve
Allow git-diff exit with codes similar to diff(1)
Diffstat (limited to 'builtin-diff-tree.c')
| -rw-r--r-- | builtin-diff-tree.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c index 24cb2d7f84..0b591c8716 100644 --- a/builtin-diff-tree.c +++ b/builtin-diff-tree.c @@ -118,7 +118,8 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) } if (!read_stdin) - return 0; + return opt->diffopt.exit_with_status ? + opt->diffopt.has_changes: 0; if (opt->diffopt.detect_rename) opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE | @@ -133,5 +134,5 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) else diff_tree_stdin(line); } - return 0; + return opt->diffopt.exit_with_status ? opt->diffopt.has_changes: 0; } |