diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:50:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 10:50:06 -0700 |
| commit | 1273738f05dedc63865085deb5d1fb8816ff809c (patch) | |
| tree | b63d47e65064ac061ed300c01ab26129a31db678 /builtin/log.c | |
| parent | 9fdc1cc872308869d76665be55367eef48f05ff6 (diff) | |
| parent | 33e0f62ba981ebfdcab8c9fb6d2935712a7b9d41 (diff) | |
| download | git-1273738f05dedc63865085deb5d1fb8816ff809c.tar.gz | |
Merge branch 'nd/struct-pathspec'
* nd/struct-pathspec:
pathspec: rename per-item field has_wildcard to use_wildcard
Improve tree_entry_interesting() handling code
Convert read_tree{,_recursive} to support struct pathspec
Reimplement read_tree_recursive() using tree_entry_interesting()
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c index 55abe07610..d43ad3a617 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -414,6 +414,7 @@ int cmd_show(int argc, const char **argv, const char *prefix) struct rev_info rev; struct object_array_entry *objects; struct setup_revision_opt opt; + struct pathspec match_all; int i, count, ret = 0; git_config(git_log_config, NULL); @@ -421,6 +422,7 @@ int cmd_show(int argc, const char **argv, const char *prefix) if (diff_use_color_default == -1) diff_use_color_default = git_use_color_default; + init_pathspec(&match_all, NULL); init_revisions(&rev, prefix); rev.diff = 1; rev.always_show_header = 1; @@ -467,7 +469,7 @@ 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, NULL, + read_tree_recursive((struct tree *)o, "", 0, 0, &match_all, show_tree_object, NULL); rev.shown_one = 1; break; |