Re: [PATCH 2/2] Convert read_tree{,_recursive} to support struct pathspec

From: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Date: Mar 24, 2011, 14:49 UTC
Message-ID: <20110324144952.GA24388@do>
In-Reply-To: <1300977675-6243-2-git-send-email-pclouds@gmail.com>

On Thu, Mar 24, 2011 at 09:41:15PM +0700, Nguyễn Thái Ngọc Duy wrote:

> All callers are updated.

Jeez.. I made last minute changes and it broke something. This should be squashed in, because tree_entry_interesting() does not like struct pathspec* == NULL.

--8<--

diff --git a/builtin/log.c b/builtin/log.c
index 796e9e5..cff39cf 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -396,6 +396,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);
@@ -403,6 +404,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;
@@ -449,7 +451,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;
--8<--

-- 
Duy