checkout: convert read_tree_some to take struct pathspec

pclouds · gitster · commit 18e4f4059936 · 2013-07-15T10:56:08.000-07:00
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/checkout.c b/builtin/checkout.c
@@ -83,12 +83,9 @@ static int update_some(const unsigned char *sha1, const char *base, int baselen,
 	return 0;
 }
 
-static int read_tree_some(struct tree *tree, const char **pathspec)
+static int read_tree_some(struct tree *tree, const struct pathspec *pathspec)
 {
-	struct pathspec ps;
-	init_pathspec(&ps, pathspec);
-	read_tree_recursive(tree, "", 0, 0, &ps, update_some, NULL);
-	free_pathspec(&ps);
+	read_tree_recursive(tree, "", 0, 0, pathspec, update_some, NULL);
 
 	/* update the index with the given tree's info
 	 * for all args, expanding wildcards, and exit
@@ -266,7 +263,7 @@ static int checkout_paths(const struct checkout_opts *opts,
 		return error(_("corrupt index file"));
 
 	if (opts->source_tree)
-		read_tree_some(opts->source_tree, opts->pathspec.raw);
+		read_tree_some(opts->source_tree, &opts->pathspec);
 
 	ps_matched = xcalloc(1, opts->pathspec.nr);
 
diff --git a/tree.c b/tree.c
@@ -47,7 +47,7 @@ static int read_one_entry_quick(const unsigned char *sha1, const char *base, int
 }
 
 static int read_tree_1(struct tree *tree, struct strbuf *base,
-		       int stage, struct pathspec *pathspec,
+		       int stage, const struct pathspec *pathspec,
 		       read_tree_fn_t fn, void *context)
 {
 	struct tree_desc desc;
@@ -116,7 +116,7 @@ static int read_tree_1(struct tree *tree, struct strbuf *base,
 
 int read_tree_recursive(struct tree *tree,
 			const char *base, int baselen,
-			int stage, struct pathspec *pathspec,
+			int stage, const struct pathspec *pathspec,
 			read_tree_fn_t fn, void *context)
 {
 	struct strbuf sb = STRBUF_INIT;
diff --git a/tree.h b/tree.h
@@ -25,7 +25,7 @@ typedef int (*read_tree_fn_t)(const unsigned char *, const char *, int, const ch
 
 extern int read_tree_recursive(struct tree *tree,
 			       const char *base, int baselen,
-			       int stage, struct pathspec *pathspec,
+			       int stage, const struct pathspec *pathspec,
 			       read_tree_fn_t fn, void *context);
 
 extern int read_tree(struct tree *tree, int stage, struct pathspec *pathspec);

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ static int read_one_entry_quick(const unsigned char sha1, const char base, int`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`static int read_tree_1(struct tree tree, struct strbuf base,`
`50`		`- int stage, struct pathspec *pathspec,`
	`50`	`+ int stage, const struct pathspec *pathspec,`
`51`	`51`	`read_tree_fn_t fn, void *context)`
`52`	`52`	`{`
`53`	`53`	`struct tree_desc desc;`
`@@ -116,7 +116,7 @@ static int read_tree_1(struct tree tree, struct strbuf base,`
`116`	`116`
`117`	`117`	`int read_tree_recursive(struct tree *tree,`
`118`	`118`	`const char *base, int baselen,`
`119`		`- int stage, struct pathspec *pathspec,`
	`119`	`+ int stage, const struct pathspec *pathspec,`
`120`	`120`	`read_tree_fn_t fn, void *context)`
`121`	`121`	`{`
`122`	`122`	`struct strbuf sb = STRBUF_INIT;`