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-blame.c | |
parent | 2a971012b6be236c46cab7212239d70d92b02715 (diff) | |
parent | d21fc9342cd82bb48bfbf9f54024ae2d4e16a9a3 (diff) | |
download | git-e61f25f3a6bb5dcbb5ae5f8b4ad26c308982373c.tar.gz |
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-blame.c')
-rw-r--r-- | builtin-blame.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index dd16b22297..d4e25a595d 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -2358,6 +2358,7 @@ parse_done: die_errno("cannot stat path '%s'", path); } + revs.disable_stdin = 1; setup_revisions(argc, argv, &revs, NULL); memset(&sb, 0, sizeof(sb)); |