diff options
| author | Russell Belfer <rb@github.com> | 2013-03-06 04:29:04 +0400 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-03-07 04:52:01 +0400 |
| commit | cc216a01ee512a41320056efc9b588daf9129f7a (patch) | |
| tree | ddcc5212fc7d860e61c52b70ead8f4f847b216ef /src/checkout.c | |
| parent | 169dc61607b69726c6012ab70758692637928a85 (diff) | |
Retire spoolandsort iterator
Since the case sensitivity is moved into the respective iterators,
this removes the spoolandsort iterator code.
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/checkout.c b/src/checkout.c index 0be87b4a3..41de0d7d4 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -1248,10 +1248,8 @@ int git_checkout_iterator( &baseline, data.opts.baseline, iterflags, data.pfx, data.pfx)) < 0) goto cleanup; - /* Handle case insensitivity for baseline if necessary */ - if (git_iterator_ignore_case(workdir) != git_iterator_ignore_case(baseline)) - if ((error = git_iterator_spoolandsort_push(baseline, true)) < 0) - goto cleanup; + /* Should not have case insensitivity mismatch */ + assert(git_iterator_ignore_case(workdir) == git_iterator_ignore_case(baseline)); /* Generate baseline-to-target diff which will include an entry for * every possible update that might need to be made. |