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/checkout.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/checkout.c')
| -rw-r--r-- | builtin/checkout.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 38632fc398..4761769512 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -79,7 +79,10 @@ static int update_some(const unsigned char *sha1, const char *base, int baselen, static int read_tree_some(struct tree *tree, const char **pathspec) { - read_tree_recursive(tree, "", 0, 0, pathspec, update_some, NULL); + struct pathspec ps; + init_pathspec(&ps, pathspec); + read_tree_recursive(tree, "", 0, 0, &ps, update_some, NULL); + free_pathspec(&ps); /* update the index with the given tree's info * for all args, expanding wildcards, and exit |