summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | submodule: don't let status change an existing instanceCarlos Martín Nieto2015-06-223-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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-221-15/+22
| | | | | | | | | | | | | | | | | | | | Instead of affecting a particular instance, make it change the configuration.
| * | | submodule: remove the per-repo cacheCarlos Martín Nieto2015-06-225-530/+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-246-14/+430
|\ \ \ \ | | | | | | | | | | 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-241-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-242-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | | 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.
* | | | Merge pull request #3254 from ethomson/diff-binary-patchCarlos Martín Nieto2015-06-242-12/+32
|\ \ \ \ | | | | | | | | | | 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.
* | | | Merge pull request #3250 from ethomson/stashCarlos Martín Nieto2015-06-243-60/+69
|\ \ \ \ | |/ / / |/| | | 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.
| * | | 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.
* | | Fixed invalid error handling in git_repository_open_ext()Pierre-Olivier Latour2015-06-231-1/+1
| | |
* | | Merge pull request #3222 from git-up/conflictedEdward Thomson2015-06-231-2/+4
|\ \ \ | | | | | | | | Fixed GIT_DELTA_CONFLICTED not returned in some cases
| * | | Fixed GIT_DELTA_CONFLICTED not returned in some casesPierre-Olivier Latour2015-06-231-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | 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 #3226 from libgit2/cmn/racy-diff-againEdward Thomson2015-06-234-5/+65
|\ \ \ | | | | | | | | racy-git, the missing link
| * | | index: check racily clean entries more thoroughlyCarlos Martín Nieto2015-06-221-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | When an entry has a racy timestamp, we need to check whether the file itself has changed since we put its entry in the index. Only then do we smudge the size field to force a check the next time around.
| * | | diff: check files with the same or newer timestampsCarlos Martín Nieto2015-06-223-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a file on the workdir has the same or a newer timestamp than the index, we need to perform a full check of the contents, as the update of the file may have happened just after we wrote the index. The iterator changes are such that we can reach inside the workdir iterator from the diff, though it may be better to have an accessor instead of moving these structs into the header.
* | | | repository: check the format versioncmn/repo-version-checkCarlos Martín Nieto2015-06-231-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is something we do on re-init but not when opening a repository. This hasn't particularly mattered up to now as the version has been 0 ever since the first release of git, but the times, they're a-changing and we will soon see version 1 in the wild. We need to make sure we don't open those.
* | | | repository: don't error out if there is no versionCarlos Martín Nieto2015-06-231-2/+7
| |/ / |/| | | | | | | | | | | git will assume the repository format version is 0 if the value is not there. Do the same.
* | | Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()Pierre-Olivier Latour2015-06-221-0/+11
| | | | | | | | | | | | | | | This fixes a bug where if a file was in conflicted state in either diff, it would not always remain in conflicted state in the merged diff.
* | | crlf: give Unix the glory of autocrlf=trueEdward Thomson2015-06-221-13/+14
| | | | | | | | | | | | | | | Perform LF->CRLF for core.autocrlf=true on non-Win32 because core git does.
* | | git_buf_text_lf_to_crlf: allow mixed line endingsEdward Thomson2015-06-222-8/+5
| | | | | | | | | | | | | | | Allow files to have mixed line endings instead of skipping processing on them.
* | | crlf: use statistics to control to workdir filterEdward Thomson2015-06-221-4/+25
| | | | | | | | | | | | | | | Use statistics (like core git) to control the behavior of the to workdir CRLF filter.
* | | Merge pull request #3240 from libgit2/cmn/commit-header-fieldEdward Thomson2015-06-221-0/+55
|\ \ \ | |_|/ |/| | commit: allow retrieving an arbitrary header field
| * | commit: allow retrieving an arbitrary header fieldcmn/commit-header-fieldCarlos Martín Nieto2015-06-221-0/+55
| |/ | | | | | | | | | | This allows the user to look up fields which we don't parse in libgit2, and allows them to access gpgsig or mergetag fields if they wish to check the signature.
* | Write modified index in git_stash_apply()Pierre-Olivier Latour2015-06-211-0/+2
|/ | | | | Same as with git_stash_save(), there's no reason not to write the index to disk since it has been modified.
* diff: preserve original mode in the indexEdward Thomson2015-06-203-12/+16
| | | | | | | When updating the index during a diff, preserve the original mode, which prevents us from dropping the mode to what we have interpreted as on our system (eg, what the working directory claims it to be, which may be a lie on some systems.)
* Merge pull request #3236 from libgit2/cmn/index-checksumEdward Thomson2015-06-204-14/+49
|\ | | | | Use the checksum to check whether an index has been modified
| * index: make relative comparison use the checksum as wellcmn/index-checksumCarlos Martín Nieto2015-06-204-9/+6
| | | | | | | | | | | | This is used by the submodule in order to figure out if the index has changed since it last read it. Using a timestamp is racy, so let's make it use the checksum, just like we now do for reloading the index itself.
| * index: use the checksum to check whether it's been modifiedCarlos Martín Nieto2015-06-192-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | We currently use a timetamp to check whether an index file has been modified since we last read it, but this is racy. If two updates happen in the same second and we read after the first one, we won't detect the second one. Instead read the SHA-1 checksum of the file, which are its last 20 bytes which gives us a sure-fire way to detect whether the file has changed since we last read it. As we're now keeping track of it, expose an accessor to this data.
* | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-172-1/+2
|/
* Merge pull request #3219 from libgit2/cmn/racy-diffCarlos Martín Nieto2015-06-176-3/+86
|\ | | | | Zero out racily-clean entries' file_size
| * checkout: allow workdir to contain checkout targetethomson/racy-diffcmn/racy-diffEdward Thomson2015-06-161-3/+14
| | | | | | | | | | | | When checking out some file 'foo' that has been modified in the working directory, allow the checkout to proceed (do not conflict) if 'foo' is identical to the target of the checkout.
| * Introduce p_utimes and p_futimesEdward Thomson2015-06-164-1/+54
| | | | | | | | | | | | Provide functionality to set the time on a filesystem entry, using utimes or futimes on POSIX type systems or SetFileTime on Win32.
| * crlf: tick the index forward to work around racy-git behaviourCarlos Martín Nieto2015-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | In order to avoid racy-git, we zero out the file size for entries with the same timestamp as the index (or during the initial checkout). This is the case in a couple of crlf tests, as the code is fast enough to do everything in the same second. As we know that we do not perform the modification just after writing out the index, which is what this is designed to work around, tick the mtime of the index file such that it doesn't agree with the files anymore, and we do not zero out these entries.
| * index: zero the size of racily-clean entriesCarlos Martín Nieto2015-06-161-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a file entry has the same timestamp as the index itself, it is considered racily-clean, as it may have been modified after the index was written, but during the same second. We take extra steps to check the contents, but this is just one part of avoiding races. For files which do have changes but have not been updated in the index, updating the on-disk index means updating its timestamp, which means we would no longer recognise these entries as racy and we would trust the timestamp to tell us whether they have changed. In order to work around this, git zeroes out the file-size field in entries with the same timestamp as the index in order to force the next diff to check the contents. Do so in libgit2 as well.
* | Merge pull request #3209 from libgit2/cmn/double-authorEdward Thomson2015-06-161-0/+10
|\ \ | | | | | | commit: ignore multiple author fields
| * | commit: ignore multiple author fieldscmn/double-authorCarlos Martín Nieto2015-06-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tools create multiple author fields. git is rather lax when parsing them, although fsck does complain about them. This means that they exist in the wild. As it's not too taxing to check for them, and there shouldn't be a noticeable slowdown when dealing with correct commits, add logic to skip over these extra fields when parsing the commit.
* | | remote: return EINVALIDSPEC when given an empty URLcmn/url-emptyCarlos Martín Nieto2015-06-161-2/+6
| | | | | | | | | | | | | | | | | | This is what we used to return in the settter and there's tests in bindings which ask for this. There's no particular reason to stop doing so.
* | | Merge pull request #3221 from git-up/build_warningsCarlos Martín Nieto2015-06-164-5/+4
|\ \ \ | |_|/ |/| | Fixed Xcode 6.1 build warnings
| * | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-154-5/+4
| | |
* | | Merge pull request #3216 from dprofeta/fixTransactionVisibilityEdward Thomson2015-06-151-0/+1
|\ \ \ | |/ / |/| | Fix visibility of transaction symbol
| * | Fix visibility of transaction symbolDamien PROFETA2015-06-121-0/+1
| | | | | | | | | | | | | | | Transaction.c did not include the visibility definition of its symbol (that are in git2/transaction.h) and so was by default hidden.
View Lorry Controller Status