diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-01-14 23:29:28 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 23:29:28 (GMT) |
commit | d6f05a435f9c89f8c9860c7af692942768d81584 (patch) | |
tree | 7b43bdb292f9cda801778647a67ddc2662504067 /builtin/log.c | |
parent | c333fe73682b182d6872f9e5b454c2899c6203ab (diff) | |
parent | 5a0b97b34c51eaddf39624857f1ac0e7df4ca2e3 (diff) | |
download | git-d6f05a435f9c89f8c9860c7af692942768d81584.zip git-d6f05a435f9c89f8c9860c7af692942768d81584.tar.gz git-d6f05a435f9c89f8c9860c7af692942768d81584.tar.bz2 |
Merge branch 'nd/attr-pathspec-in-tree-walk'
The traversal over tree objects has learned to honor
":(attr:label)" pathspec match, which has been implemented only for
enumerating paths on the filesystem.
* nd/attr-pathspec-in-tree-walk:
tree-walk: support :(attr) matching
dir.c: move, rename and export match_attrs()
pathspec.h: clean up "extern" in function declarations
tree-walk.c: make tree_entry_interesting() take an index
tree.c: make read_tree*() take 'struct repository *'
Diffstat (limited to 'builtin/log.c')
-rw-r--r-- | builtin/log.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index e8e5106..3e145fe 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -641,8 +641,9 @@ int cmd_show(int argc, const char **argv, const char *prefix) diff_get_color_opt(&rev.diffopt, DIFF_COMMIT), name, diff_get_color_opt(&rev.diffopt, DIFF_RESET)); - read_tree_recursive((struct tree *)o, "", 0, 0, &match_all, - show_tree_object, rev.diffopt.file); + read_tree_recursive(the_repository, (struct tree *)o, "", + 0, 0, &match_all, show_tree_object, + rev.diffopt.file); rev.shown_one = 1; break; case OBJ_COMMIT: |