diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-25 17:13:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-25 17:13:11 -0800 |
| commit | d64d4835b83669d5c9c8ce1989859efa803874db (patch) | |
| tree | 6748e48171e74bb97dc56efa9e7d133a7674e1a2 /builtin-checkout.c | |
| parent | f18e6bef23809d2823c1a687f375b22c6af0e735 (diff) | |
| parent | 0b50922abffb82c473182b03eb5bb47a978cceac (diff) | |
| download | git-d64d4835b83669d5c9c8ce1989859efa803874db.tar.gz | |
Merge branch 'cb/add-pathspec'
* cb/add-pathspec:
remove pathspec_match, use match_pathspec instead
clean up pathspec matching
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 275176d15d..6cdb320ae7 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -230,7 +230,7 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec, for (pos = 0; pos < active_nr; pos++) { struct cache_entry *ce = active_cache[pos]; - pathspec_match(pathspec, ps_matched, ce->name, 0); + match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, ps_matched); } if (report_path_error(ps_matched, pathspec, 0)) @@ -239,7 +239,7 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec, /* Any unmerged paths? */ for (pos = 0; pos < active_nr; pos++) { struct cache_entry *ce = active_cache[pos]; - if (pathspec_match(pathspec, NULL, ce->name, 0)) { + if (match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, NULL)) { if (!ce_stage(ce)) continue; if (opts->force) { @@ -264,7 +264,7 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec, state.refresh_cache = 1; for (pos = 0; pos < active_nr; pos++) { struct cache_entry *ce = active_cache[pos]; - if (pathspec_match(pathspec, NULL, ce->name, 0)) { + if (match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, NULL)) { if (!ce_stage(ce)) { errs |= checkout_entry(ce, &state, NULL); continue; |