summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Rename FALLBACK to UNSPECIFIEDcmn/rename-unspecifiedCarlos Martín Nieto2015-06-2513-26/+26
| | | | | Fallback describes the mechanism, while unspecified explains what the user is thinking.
* Merge pull request #3097 from libgit2/cmn/submodule-config-stateCarlos Martín Nieto2015-06-2420-1015/+616
|\ | | | | Remove run-time configuration settings from submodules
| * submodule: remove the RESET enum valuescmn/submodule-config-stateCarlos Martín Nieto2015-06-222-9/+1
| | | | | | | | | | These are not useful anymore, as we don't affect the instance's configuration.
| * submodule: test unsetting config optionsCarlos Martín Nieto2015-06-221-13/+29
| | | | | | | | | | | | In addition to mapping enums to strings in the configuration, we need to know to delete the configuration option when given the "none" or "no" option.
| * submodule: handle writing out all enum values for settingsCarlos Martín Nieto2015-06-222-65/+21
| | | | | | | | | | | | We currently do not handle those enum values which require us to set "true" or unset variables in all cases. Use a common function which does understand this by looking at our mapping directly.
| * config: provide a function to reverse-lookup mapped cvarsCarlos Martín Nieto2015-06-222-0/+26
| |
| * examples: adjust to submodule status API changeCarlos Martín Nieto2015-06-221-16/+10
| |
| * submodule: test more accurately for non-existenceCarlos Martín Nieto2015-06-221-4/+4
| | | | | | | | | | | | The current code will always fail, but only because it's asking for a string on a live config. Take a snapshot and make sure we fail with ENOTFOUND instead of any old error.
| * submodule: fix potential leak in the testsCarlos Martín Nieto2015-06-221-2/+1
| |
| * submodule: get rid of `_save()`Carlos Martín Nieto2015-06-223-61/+0
| | | | | | | | | | We no longer have any setters which affect an instance, so `git_submodule_save()` is no longer relevant.
| * submodule: make `_set_url()` affect the configurationCarlos Martín Nieto2015-06-224-61/+17
| | | | | | | | With this one, we can get rid of the edit_and_save test.
| * submodule: make `_set_branch()` affect the configurationCarlos Martín Nieto2015-06-223-70/+53
| |
| * submodule: make `_set_update_fetch_recurse_submodules()` affect the configCarlos Martín Nieto2015-06-223-53/+49
| | | | | | | | | | | | Similarly to the other ones. In this test we copy over testing `RECURSE_YES` which shows an error in our handling of the `YES` variant which we may have to port to the rest.
| * submodule: make `_set_update()` affect the configurationCarlos Martín Nieto2015-06-223-58/+47
| | | | | | | | | | Moving on with the removal of runtime-changing variables, the update setting for a remote is whatever it was when it was looked up.
| * submodule: correct detection of existing submodulesCarlos Martín Nieto2015-06-221-10/+26
| | | | | | | | | | | | | | | | | | During the cache deletion, the check for whether we consider a submodule to exist got changed regarding submodules which are in the worktree but not configured. Instead of checking for the url field to be populated, check the location where we've found it.
| * submodule: bring back finding by pathCarlos Martín Nieto2015-06-221-0/+42
| | | | | | | | | | During the removal of the cache, we also removed the ability to use `_lookup()` to search by path rather than name. Bring this logic back.
| * submodule: add an ignore option to statusCarlos Martín Nieto2015-06-2210-61/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | This lets us specify in the status call which ignore rules we want to use (optionally falling back to whatever the submodule has in its configuration). This removes one of the reasons for having `_set_ignore()` set the value in-memory. We re-use the `IGNORE_RESET` value for this as it is no longer relevant but has a similar purpose to `IGNORE_FALLBACK`. Similarly, we remove `IGNORE_DEFAULT` which does not have use outside of initializers and move that to fall back to the configuration as well.
| * submodule: don't let status change an existing instanceCarlos Martín Nieto2015-06-226-24/+44
| | | | | | | | | | | | As submodules are becomes more like values, we should not let a status check to update its properties. Instead of taking a submodule, have status take a repo and submodule name.
| * submodule: make set_ignore() affect the configurationCarlos Martín Nieto2015-06-225-56/+50
| | | | | | | | | | Instead of affecting a particular instance, make it change the configuration.
| * submodule: remove the per-repo cacheCarlos Martín Nieto2015-06-227-576/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | Having this cache and giving them out goes against our multithreading guarantees and it makes it impossible to use submodules in a multi-threaded environment, as any thread can ask for a refresh which may reallocate some string in the submodule struct which we've accessed in a different one via a getter. This makes the submodules behave more like remotes, where each object is created upon request and not shared except explicitly by the user. This means that some tests won't pass yet, as they assume they can affect the submodule objects in the cache and that will affect later operations.
* | Merge pull request #3183 from libgit2/cmn/curl-streamCarlos Martín Nieto2015-06-2411-23/+475
|\ \ | | | | | | Implement a cURL stream
| * | SecureTransport: use the curl stream if availablecmn/curl-streamCarlos Martín Nieto2015-06-241-1/+17
| | | | | | | | | | | | | | | | | | If the libcurl stream is available, use that as the underlying stream instead of the socket stream. This allows us to set a proxy for HTTPS connections.
| * | curl: remove the encrypted param to the constructorCarlos Martín Nieto2015-06-244-14/+6
| | | | | | | | | | | | | | | We do not want libcurl to perform the TLS negotiation for us, so we don't need to pass this option.
| * | http: ask for the curl stream for non-encrypted connectionsCarlos Martín Nieto2015-06-241-4/+4
| | | | | | | | | | | | | | | | | | The TLS streams talk over the curl stream themselves, so we don't need to ask for it explicitly. Do so in the case of the non-encrypted one so we can still make use proxies in that case.
| * | openssl: use the curl stream if availableCarlos Martín Nieto2015-06-241-12/+110
| | | | | | | | | | | | | | | | | | | | | | | | When linking against libcurl, use it as the underlying transport instead of straight sockets. We can't quite just give over the file descriptor, as curl puts it into non-blocking mode, so we build a custom BIO so OpenSSL sends the data through our stream, be it the socket or curl streams.
| * | curl: extract certificate informationCarlos Martín Nieto2015-06-242-3/+46
| | | | | | | | | | | | | | | | | | The information is exposed by curl for some crypto libraries in the form of name:content strings. We can't do much more than return this information.
| * | http: set the proxy if the stream supports itCarlos Martín Nieto2015-06-241-0/+11
| | | | | | | | | | | | | | | Of the built-in ones, only cURL support it, but there's no reason a user-provided stream wouldn't support it.
| * | stream: add support for setting a proxyCarlos Martín Nieto2015-06-243-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | If the stream claims to support this feature, we can let the transport set the proxy. We also set HTTPPROXYTUNNEL option so curl can create a tunnel through the proxy which lets us create our own TLS session (if needed).
| * | curl: add CHANGELOG and THREADING entriesCarlos Martín Nieto2015-06-242-9/+20
| | |
| * | Implement a curl streamCarlos Martín Nieto2015-06-243-1/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | cURL has a mode in which it acts a lot like our streams, providing send and recv functions and taking care of the TLS and proxy setup for us. Implement a new stream which uses libcurl instead of raw sockets or the TLS libraries directly. This version does not support reporting certificates or proxies yet.
| * | curl: find and link with the library if it's available by defaultCarlos Martín Nieto2015-06-241-0/+11
| | |
* | | Merge pull request #3254 from ethomson/diff-binary-patchCarlos Martín Nieto2015-06-243-12/+69
|\ \ \ | | | | | | | | Handle binary DIFFABLEness properly
| * | | diff: determine DIFFABLE-ness for binariesEdward Thomson2015-06-242-12/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always set `GIT_DIFF_PATCH_DIFFABLE` for all files, regardless of binary-ness, so that the binary callback is invoked to either show the binary contents, or just print the standard "Binary files differ" message. We may need to do deeper inspection for binary files where we have avoided loading the contents into a file map.
| * | | diff::binary tests: empty diff when forced binaryEdward Thomson2015-06-241-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | Ensure that even when we're forcing a binary diff that we do not assume that there *is* a diff. There should be an empty diff for no change.
| * | | binary diff: test that the diff and patch otputs are the samecmn/diff-binary-patchCarlos Martín Nieto2015-06-241-0/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | We test the generation of the textual patch via the patch function, which are just one of two possibilities to get the output. Add a second patch generation via the diff function to make sure both outputs are in sync.
* | | Merge pull request #3250 from ethomson/stashCarlos Martín Nieto2015-06-246-71/+95
|\ \ \ | |/ / |/| | Stash workdir correctly when added in the index, modified in the workdir
| * | stash: save the workdir file when deleted in indexEdward Thomson2015-06-233-14/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When stashing the workdir tree, examine the index as well. Using a mechanism similar to `git_diff_tree_to_workdir_with_index` allows us to determine that a file was added in the index and subsequently modified in the working directory. Without examining the index, we would erroneously believe that this file was untracked and fail to include it in the working directory tree. Use a slightly modified `git_diff_tree_to_workdir_with_index` in order to avoid some of the behavior custom to `git diff`. In particular, be sure to include the working directory side of a file when it was deleted in the index.
| * | stash tests: ensure we save the workdir fileEdward Thomson2015-06-233-11/+26
| | | | | | | | | | | | | | | | | | Ensure that when a file is added in the index and subsequently modified in the working directory, the stashed working directory tree contains the actual working directory contents.
| * | git_diff__merge: allow pluggable diff mergesEdward Thomson2015-06-232-3/+19
| | |
| * | diff_tform: remove reversed copy of delta mergerEdward Thomson2015-06-231-46/+7
| | | | | | | | | | | | | | | Drop `git_diff__merge_like_cgit_reversed`, since it's a copy and paste mess of slightly incompatible changes.
* | | Merge pull request #3251 from git-up/fixesEdward Thomson2015-06-242-3/+3
|\ \ \ | | | | | | | | Fixes
| * | | Fixed invalid error handling in git_repository_open_ext()Pierre-Olivier Latour2015-06-231-1/+1
| | | |
| * | | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-231-2/+2
|/ / /
* | | Merge pull request #3222 from git-up/conflictedEdward Thomson2015-06-232-3/+34
|\ \ \ | | | | | | | | Fixed GIT_DELTA_CONFLICTED not returned in some cases
| * | | Fixed GIT_DELTA_CONFLICTED not returned in some casesPierre-Olivier Latour2015-06-232-3/+34
| |/ / | | | | | | | | | | | | | | | | | | | | | If an index entry for a file that is not in HEAD is in conflicted state, when diffing HEAD with the index, the status field of the corresponding git_diff_delta was incorrectly reported as GIT_DELTA_ADDED instead of GIT_DELTA_CONFLICTED. This was due to handle_unmatched_new_item() initially setting the status to GIT_DELTA_CONFLICTED but then overriding it later with GIT_DELTA_ADDED.
* | | Merge pull request #3131 from urkud/const-charEdward Thomson2015-06-231-1/+1
|\ \ \ | | | | | | | | Add `const` qualifier
| * | | Add `const` qualifierYury G. Kudryashov2015-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a warning in `examples/describe.c` without breaking the main build. OTOH, I'm not sure if this is an API-compatible change.
* | | | Merge pull request #3226 from libgit2/cmn/racy-diff-againEdward Thomson2015-06-2310-45/+229
|\ \ \ \ | | | | | | | | | | racy-git, the missing link
| * | | | Add a note about racy-git in CHANGELOGcmn/racy-diff-againCarlos Martín Nieto2015-06-221-0/+3
| | | | |
| * | | | index: add a diff test for smudging a file which becomes emptyCarlos Martín Nieto2015-06-221-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | Even though the file is empty and thus the size in the entry matches, we should be able to detect it as a difference.
View Lorry Controller Status