summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixes #2443 Zero size arrays are an extensionphkelley/flexarrayPhilip Kelley2014-06-261-1/+1
|
* pack: clean up error returnsCarlos Martín Nieto2014-06-252-13/+11
| | | | | | | | | Set a message when we fail to lock. Also make the put function void, since it's called from free, which cannot report errors. The only errors we can experience here are internal state corruption, so we assert that we are trying to put a pack which we have previously got.
* tree: free in error conditionsCarlos Martín Nieto2014-06-251-0/+2
| | | | As reported by coverity, we would leak some memory in error conditions.
* pack: free the new pack struct if we fail to insertCarlos Martín Nieto2014-06-252-4/+7
| | | | | | | | If we fail to insert the packfile in the map, make sure to free it. This makes the free function only attempt to remove its mwindows from the global list if we have opened the packfile to avoid accessing the list unlocked.
* Update text=auto / core.autocrlf=false behaviorEdward Thomson2014-06-241-1/+2
| | | | | | | Git for Windows 1.9.4 changed the behavior when the text=auto attribute is specified and core.autocrlf=false. Previous observed behavior would *not* filter files when going into the working directory, the new behavior *does* filter. Update our behavior to match.
* Merge remote-tracking branch 'upstream/cmn/mixed-eol-passthrough'Carlos Martín Nieto2014-06-242-7/+12
|\
| * crlf: pass-through mixed EOL buffers from LF->CRLFcmn/mixed-eol-passthroughCarlos Martín Nieto2014-06-232-7/+12
| | | | | | | | | | | | | | | | | | | | When checking out files, we're performing conversion into the user's native line endings, but we only want to do it for files which have consistent line endings. Refuse to perform the conversion for mixed-EOL files. The CRLF->LF filter is left as-is, as that conversion is considered to be normalization by git and should force a conversion of the line endings.
* | Merge remote-tracking branch 'upstream/cmn/treebuilder-perf'Carlos Martín Nieto2014-06-242-58/+62
|\ \
| * | treentry: no need for manual size book-keepingcmn/treebuilder-perfCarlos Martín Nieto2014-06-102-10/+6
| | | | | | | | | | | | We can simply ask the hasmap.
| * | treebuilder: don't keep removed entries aroundCarlos Martín Nieto2014-06-102-35/+17
| | | | | | | | | | | | | | | | | | If the user wants to keep a copy for themselves, they should make a copy. It adds unnecessary complexity to make sure the returned entries are valid until the builder is cleared.
| * | treebuilder: use a map instead of vector to store the entriesCarlos Martín Nieto2014-06-102-51/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finding a filename in a vector means we need to resort it every time we want to read from it, which includes every time we want to write to it as well, as we want to find duplicate keys. A hash-map fits what we want to do much more accurately, as we do not care about sorting, but just the particular filename. We still keep removed entries around, as the interface let you assume they were going to be around until the treebuilder is cleared or freed, but in this case that involves an append to a vector in the filter case, which can now fail. The only time we care about sorting is when we write out the tree, so let's make that the only time we do any sorting.
* | | Merge branch 'cmn/global-mwf'Carlos Martín Nieto2014-06-246-14/+160
|\ \ \
| * | | Share packs across repository instancescmn/global-mwfCarlos Martín Nieto2014-06-236-14/+160
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Opening the same repository multiple times will currently open the same file multiple times, as well as map the same region of the file multiple times. This is not necessary, as the packfile data is immutable. Instead of opening and closing packfiles directly, introduce an indirection and allocate packfiles globally. This does mean locking on each packfile open, but we already use this lock for the global mwindow list so it doesn't introduce a new contention point.
* | | Merge remote-tracking branch 'upstream/cmn/filebuf-atomic-unlock'Carlos Martín Nieto2014-06-232-4/+28
|\ \ \ | |/ / |/| |
| * | filebuf: make unlocking atomiccmn/filebuf-atomic-unlockCarlos Martín Nieto2014-06-042-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When renaming a lock file to its final location, we need to make sure that it is replaced atomically. We currently have a workaround for Windows by removing the target file. This means that the target file, which may be a ref or a packfile, may cease to exist for a short wile, which shold be avoided. Implement the workaround only in Windows, by making sure that the file we want to replace is writable.
* | | Merge pull request #2421 from libgit2/cmn/init-ssl-onceVicent Marti2014-06-144-16/+81
|\ \ \ | | | | | | | | netops: init OpenSSL once under lock
| * | | ssl: init everything all the timecmn/init-ssl-onceCarlos Martín Nieto2014-06-123-87/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring together all of the OpenSSL initialization to git_threads_init() so it's together and doesn't need locks. Moving it here also gives us libssh2 thread safety (when built against openssl).
| * | | ssl: init also without threadsCarlos Martín Nieto2014-06-121-9/+10
| | | |
| * | | ssl: cargo-cult thread safetyCarlos Martín Nieto2014-06-124-23/+46
| | | | | | | | | | | | | | | | OpenSSL's tests init everything in the main thread, so let's do that.
| * | | ssl: use lockingCarlos Martín Nieto2014-06-111-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using in a multithreaded context, OpenSSL needs to lock, and leaves it up to application to provide said locks. We were not doing this, and it's just luck that's kept us from crashing up to now.
| * | | netops: init OpenSSL once under lockCarlos Martín Nieto2014-06-113-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OpenSSL init functions are not reentrant, which means that running multiple fetches in parallel can cause us to crash. Use a mutex to init OpenSSL, and since we're adding this extra checks, init it only once.
* | | | http: fix typo in credentials logicCarlos Martín Nieto2014-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | We want to check whether the credentials callback is NULL, not whether the payload is.
* | | | revwalk: more sensible array handlingcmn/revwalk-array-fixCarlos Martín Nieto2014-06-111-2/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Instead of using a sentinel empty value to detect the last commit, let's check for when we get a NULL from popping the stack, which lets us know when we're done. The current code causes us to read uninitialized data, although only on RHEL/CentOS 6 in release mode. This is a readability win overall.
* | | treebuilder: insert sortedcmn/treebuilder-insert-sortedCarlos Martín Nieto2014-06-101-2/+2
| | | | | | | | | | | | | | | By inserting in the right position, we can keep the vector sorted, making entry insertion almost twice as fast.
* | | Merge pull request #2407 from libgit2/cmn/remote-rename-morev0.21.0-rc1Vicent Marti2014-06-081-71/+80
|\ \ \ | | | | | | | | More remote rename fixes
| * | | remote: don't free the remote on deletecmn/remote-rename-moreCarlos Martín Nieto2014-06-061-2/+0
| | | | | | | | | | | | | | | | This was a bad idea. Don't free except in the free function.
| * | | remote: handle symrefs when renamingCarlos Martín Nieto2014-06-061-10/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A symref inside the namespace gets renamed, we should make it point to the target's new name. This is for the origin/HEAD -> origin/master type of situations.
| * | | remote: return problem refspecs instead of using a callbackCarlos Martín Nieto2014-06-061-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | There is no reason why we need to use a callback here. A string array fits better with the usage, as this is not an event and we don't need anything from the user.
| * | | remote: make sure the name stays valid on renameCarlos Martín Nieto2014-06-061-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | We must make sure that the name pointer remains valid, so make sure to allocate the new one before freeing the old one and swap them so the user never sees an invalid pointer.
| * | | remote: remove rename code for anonymous remotesCarlos Martín Nieto2014-06-061-42/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | We don't allow renames of anonymous remotes, so there's no need to handle them. A remote is always associated with a repository, so there's no need to check for that.
* | | React to review feedbackPhilip Kelley2014-06-073-18/+26
| | |
* | | Win32: Fix object::cache::threadmania test on x64Philip Kelley2014-06-075-63/+91
|/ /
* | remote: tighten up reference renamingcmn/remote-rename-fixesCarlos Martín Nieto2014-06-061-7/+9
|/ | | | | | | | Tighten up which references we consider for renaming so we don't try to rename unrelated ones and end up with unexplained references. If there is a reference on the target namespace, git overwrites it, so let's do the same.
* Merge pull request #2399 from libgit2/cmn/path-to-pathVicent Marti2014-06-034-35/+26
|\ | | | | clone: re-use the local transport's path resolution
| * clone: re-use the local transport's path resolutioncmn/path-to-pathCarlos Martín Nieto2014-06-034-35/+26
| | | | | | | | | | | | Whe already worked out the kinks with the function used in the local transport. Expose it and make use of it in the local clone method instead of trying to work it out again.
* | Merge pull request #2395 from libgit2/cmn/ref-iter-concurrentRussell Belfer2014-06-031-8/+16
|\ \ | |/ |/| Concurrent ref iterator access
| * refs: copy the packed refs on iterationcmn/ref-iter-concurrentCarlos Martín Nieto2014-06-021-8/+16
| | | | | | | | | | This lets us work without worrying about what's happening but work on a snapshot.
* | Merge pull request #2389 from ↵Vicent Marti2014-06-031-0/+1
|\ \ | |/ |/| | | | | arthurschreiber/arthur/set-error-when-no-remote-found Remote: Set an error when a remote cannot be found.
| * Remote: Set an error when a remote cannot be found.Arthur Schreiber2014-05-301-0/+1
| | | | | | | | | | | | | | Inside `git_remote_load`, the calls to `get_optional_config` use `giterr_clear` to unset any errors that are set due to missing config keys. If neither a fetch nor a push url config was found for a remote, we should set an error again.
* | remote: build up the list of refs to removecmn/remote-deleteCarlos Martín Nieto2014-06-011-8/+34
| | | | | | | | | | | | When removing the remote-tracking branches, build up the list and remove in two steps, working around an issue with the iterator. Removing while we're iterating over the refs can cause us to miss references.
* | minor cleanupsRussell Belfer2014-05-311-5/+5
| |
* | Clean up the handling of large binary diffsRussell Belfer2014-05-312-38/+55
| |
* | Ignore core.safecrlf=warn until we have a warn infrastructureEdward Thomson2014-05-301-1/+7
|/
* Refs: Introduce `git_refname_t`.Arthur Schreiber2014-05-302-13/+12
|
* Refs: Fix some issue when core.precomposeunicode = true.Arthur Schreiber2014-05-302-25/+9
| | | | | | | | | | | This fixes two issues I found when core.precomposeunicode is enabled: * When creating a reference with a NFD string, the returned git_reference would return this NFD string as the reference’s name. But when looking up the reference later, the name would then be returned as NFC string. * Renaming a reference would not honor the core.precomposeunicode and apply no normalization to the new reference name.
* config: initialize the errorCarlos Martín Nieto2014-05-301-1/+1
| | | | | The error would be uninitialized if we take a snapshot of a config with no backends.
* Merge pull request #2011 from libgit2/cmn/clone-localVicent Marti2014-05-294-13/+179
|\ | | | | Local clone
| * clone: allow for linking in local cloneCarlos Martín Nieto2014-05-281-5/+31
| | | | | | | | | | | | | | | | If requested, git_clone_local_into() will try to link the object files instead of copying them. This only works on non-Windows (since it doesn't have this) when both are on the same filesystem (which are unix semantics).
| * fileops: allow linking files when copying directory structuresCarlos Martín Nieto2014-05-282-2/+6
| | | | | | | | | | When passed the LINK_FILES flag, the recursive copy will hardlink files instead of copying them.
| * clone: add flag not to linkCarlos Martín Nieto2014-05-281-1/+1
| |
View Lorry Controller Status