diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-11-23 22:30:08 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-11-23 22:30:08 -0800 |
commit | e61f25f3a6bb5dcbb5ae5f8b4ad26c308982373c (patch) | |
tree | 2add4512857b856b31b35f2b827975c3d916ff63 /builtin-diff-tree.c | |
parent | 2a971012b6be236c46cab7212239d70d92b02715 (diff) | |
parent | d21fc9342cd82bb48bfbf9f54024ae2d4e16a9a3 (diff) | |
download | git-e61f25f3a6bb5dcbb5ae5f8b4ad26c308982373c.tar.gz git-e61f25f3a6bb5dcbb5ae5f8b4ad26c308982373c.tar.xz |
Merge branch 'jc/log-stdin'
* jc/log-stdin:
Add trivial tests for --stdin option to log family
Make --stdin option to "log" family read also pathspecs
setup_revisions(): do not call get_pathspec() too early
Teach --stdin option to "log" family
read_revision_from_stdin(): use strbuf
Conflicts:
revision.c
Diffstat (limited to 'builtin-diff-tree.c')
-rw-r--r-- | builtin-diff-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c index 79cedb72c..2380c2195 100644 --- a/builtin-diff-tree.c +++ b/builtin-diff-tree.c @@ -104,6 +104,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) git_config(git_diff_basic_config, NULL); /* no "diff" UI options */ opt->abbrev = 0; opt->diff = 1; + opt->disable_stdin = 1; argc = setup_revisions(argc, argv, opt, NULL); while (--argc > 0) { |