diff options
| author | Edward Thomson <ethomson@github.com> | 2017-01-14 17:41:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-14 17:41:49 +0000 |
| commit | cb76eed5ce41c64607c4f99af947c79c493e8b7e (patch) | |
| tree | 8cadf7f068802f02f587c59508c590b9ec9a0c39 /src/checkout.c | |
| parent | 2854e61956871f7b26ee38040e70f6db92796c1a (diff) | |
| parent | 5f959dca0d7d7d921ccf2948e0745659f6055148 (diff) | |
| download | libgit2-cb76eed5ce41c64607c4f99af947c79c493e8b7e.tar.gz | |
Merge pull request #4054 from jfultz/jfultz/fix_GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH
Fix handling of GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH flag.
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/checkout.c b/src/checkout.c index 0cc29054d..b70d5ab35 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -2553,6 +2553,10 @@ int git_checkout_iterator( GIT_ITERATOR_IGNORE_CASE : GIT_ITERATOR_DONT_IGNORE_CASE; baseline_opts.start = data.pfx; baseline_opts.end = data.pfx; + if (opts && (opts->checkout_strategy & GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH)) { + baseline_opts.pathlist.count = opts->paths.count; + baseline_opts.pathlist.strings = opts->paths.strings; + } if (data.opts.baseline_index) { if ((error = git_iterator_for_index( |