X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-tree.c;h=0b591c87169ff4b8c2173bedb26d6ed1a8a84b68;hb=4f3d37035a7c735a3b69f962656819f4ff7e4927;hp=f8215ea7072af34072a73221273c1b9cdadd18d6;hpb=db6296a566eb1a8007a84330a911b38055720743;p=git.git diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c index f8215ea70..0b591c871 100644 --- a/builtin-diff-tree.c +++ b/builtin-diff-tree.c @@ -59,7 +59,7 @@ static const char diff_tree_usage[] = " --root include the initial commit as diff against /dev/null\n" COMMON_DIFF_OPTIONS_HELP; -int cmd_diff_tree(int argc, const char **argv, char **envp) +int cmd_diff_tree(int argc, const char **argv, const char *prefix) { int nr_sha1; char line[1000]; @@ -67,7 +67,7 @@ int cmd_diff_tree(int argc, const char **argv, char **envp) static struct rev_info *opt = &log_tree_opt; int read_stdin = 0; - init_revisions(opt, setup_git_directory()); + init_revisions(opt, prefix); git_config(git_default_config); /* no "diff" UI options */ nr_sha1 = 0; opt->abbrev = 0; @@ -118,7 +118,8 @@ int cmd_diff_tree(int argc, const char **argv, char **envp) } 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, char **envp) else diff_tree_stdin(line); } - return 0; + return opt->diffopt.exit_with_status ? opt->diffopt.has_changes: 0; }