summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #2449 from libgit2/cmn/maint-21Vicent Marti2014-07-022-11/+19
|\ \ \ \ \ | | | | | | | | | | | | Maint fixes for ssl initing and ssh exposure
| * | | | | ssh: always declare the libssh2 typesCarlos Martín Nieto2014-06-302-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets a user decide they do want to use keyboard-interactive after they've compiled.
| * | | | | ssh: create the right callback signature based on build optionsCarlos Martín Nieto2014-06-302-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When linking against libssh2, create the transport.h such that it contains its definition for custom crypto and keyboard-interactive callbacks. If we don't link against libssh2, create an equivalent signature which has void pointers instead of pointers to libssh2 structures. This would be one way to fix #2438.
| * | | | | ssl: init only once without threadsCarlos Martín Nieto2014-06-301-1/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OpenSSL library-loading functions do not expect to be called multiple times. Add a flag in the non-threaded libgit2 init so we only call once. This fixes #2446.
* | | | | Merge pull request #2455 from ethomson/equal_oidVicent Marti2014-07-0240-151/+161
|\ \ \ \ \ | | | | | | | | | | | | Introduce `cl_assert_equal_oid`
| * | | | | revwalk::simplify test should testEdward Thomson2014-07-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The revwalk::simplify test was not actually tested the values from the revwalk against the expected. (Further, the expected had two IDs transposed.)
| * | | | | Introduce cl_assert_equal_oidEdward Thomson2014-07-0139-148/+158
| | | | | |
* | | | | | Merge pull request #2453 from ethomson/checkout_indexVicent Marti2014-07-026-175/+162
|\ \ \ \ \ \ | | | | | | | | | | | | | | git_checkout_index: checkout other indexes
| * | | | | | git_checkout_index: checkout other indexesEdward Thomson2014-07-016-175/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git_checkout_index can now check out other git_index's (that are not necessarily the repository index). This allows checkout_index to use the repository's index for stat cache information instead of the index data being checked out. git_merge and friends now check out their indexes directly instead of trying to blend it into the running index.
* | | | | | | Merge pull request #2452 from libgit2/cmn/clone-custom-repoVicent Marti2014-07-027-148/+118
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Provide a callback to customize the repository on clone
| * | | | | | | clone: remote git_clone_into{,_local} from the public APIcmn/clone-custom-repoCarlos Martín Nieto2014-07-027-144/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As git_clone now has callbacks to configure the details of the repository and remote, remove the lower-level functions from the public API, as they lack some of the logic from git_clone proper.
| * | | | | | | clone: add a callback for repository creationCarlos Martín Nieto2014-07-023-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analogously to the remote creation callback, provide a way for the user of git_clone() to create the repository with whichever options they desire via callback.
* | | | | | | | Merge pull request #2456 from libgit2/cmn/ssh-send-everythingVicent Marti2014-07-021-1/+12
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | ssh: libssh2_channel_write() behaves like send()
| * | | | | | | ssh: libssh2_channel_write() behaves like send()cmn/ssh-send-everythingCarlos Martín Nieto2014-07-021-1/+12
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the stream writing function was written, it assume that libssh2_channel_write() would always write all of the data to the wire. This is only true for the first 32k of data, which it tries to fit into one ssh packet. Since it can perform short writes, call it in a loop like we do for send(), advancing the buffer offset.
* | | | | | | Merge pull request #2451 from libgit2/rb/round-up-pool-allocationsVicent Marti2014-07-012-6/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Round up pool alloc sizes for alignment
| * | | | | | Round up pool alloc sizes for alignmentrb/round-up-pool-allocationsRussell Belfer2014-06-302-6/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure that items returned from pool allocations are aligned on nice boundaries, this rounds up all pool allocation sizes to a multiple of 8. This adds a small amount of overhead to each item. The rounding up could be made optional with an extra parameter to the pool initialization that turned on rounding only for pools where item alignment actually matters, but I think for the extra code and complexity that would be involved, that it makes sense just to burn a little bit of extra memory and enable this all the time.
* | | | | | Merge pull request #2440 from phkelley/transportsVicent Marti2014-06-3010-68/+177
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improvements to git_transport extensibility
| * | | | | | Improvements to git_transport extensibilityPhilip Kelley2014-06-2610-68/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git_remote_set_transport now takes a transport factory rather than a transport git_clone_options now allows the caller to specify a remote creation callback
* | | | | | | Merge pull request #2447 from phkelley/pkt_assertVicent Marti2014-06-272-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix assert when receiving uncommon sideband packet
| * | | | | | | Fix assert when receiving uncommon sideband packetPhilip Kelley2014-06-272-1/+8
|/ / / / / / /
* | | | | | | Merge pull request #2445 from ethomson/checkout_conflict_testVicent Marti2014-06-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | checkout::conflict tests: only test owner mode
| * | | | | | | checkout::conflict tests: only test owner modeEdward Thomson2014-06-261-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The checkout::conflict type conflict tests were failing because they were overly assertive about the resultant mode, testing group & other bits, which failed miserably for people who had a umask less restrictive than 022. Only test the resultant owner bits.
* | | | | | | Merge pull request #2444 from libgit2/phkelley/flexarrayPhilip Kelley2014-06-261-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fixes #2443 Zero size arrays are an extension
| * | | | | | Fixes #2443 Zero size arrays are an extensionphkelley/flexarrayPhilip Kelley2014-06-261-1/+1
|/ / / / / /
* | | | | | Merge pull request #2442 from libgit2/cmn/leaksVicent Marti2014-06-254-17/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix a couple of leaks
| * | | | | | 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.
* | | | | | travis: build the master branchCarlos Martín Nieto2014-06-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to tell Travis to build the master branch or it won't build it or the pull requests.
* | | | | | Merge pull request #2435 from ethomson/text_attrVicent Marti2014-06-253-3/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update text=auto / core.autocrlf=false behavior
| * | | | | | Update text=auto / core.autocrlf=false behaviorEdward Thomson2014-06-243-3/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #2439 from ethomson/revert_exportVicent Marti2014-06-251-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Export git_revert_commit
| * | | | | Export git_revert_commitEdward Thomson2014-06-251-1/+1
|/ / / / /
* | | | | Add CHANGELOG entry for mixed-EOL fixCarlos Martín Nieto2014-06-241-0/+2
| | | | |
* | | | | Merge remote-tracking branch 'upstream/cmn/mixed-eol-passthrough'Carlos Martín Nieto2014-06-244-33/+22
|\ \ \ \ \
| * | | | | crlf: pass-through mixed EOL buffers from LF->CRLFcmn/mixed-eol-passthroughCarlos Martín Nieto2014-06-234-33/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Add CHANGELOG entry for treebuilder mapCarlos Martín Nieto2014-06-241-0/+2
| | | | | |
* | | | | | Merge remote-tracking branch 'upstream/cmn/treebuilder-perf'Carlos Martín Nieto2014-06-244-62/+72
|\ \ \ \ \ \
| * | | | | | 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-103-38/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-104-54/+84
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Add CHANGELOG entry for shared packsCarlos Martín Nieto2014-06-241-0/+2
| | | | | |
* | | | | | Merge branch 'cmn/global-mwf'Carlos Martín Nieto2014-06-247-14/+202
|\ \ \ \ \ \
| * | | | | | Share packs across repository instancescmn/global-mwfCarlos Martín Nieto2014-06-237-14/+202
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #2434 from libgit2/rb/contributing-updatesVicent Marti2014-06-242-33/+75
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update CONTRIBUTING and PROJECTS
| * | | | | | missing parenrb/contributing-updatesRussell Belfer2014-06-201-1/+1
| | | | | | |
| * | | | | | Update CONTRIBUTING and PROJECTSRussell Belfer2014-06-202-33/+75
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates CONTRIBUTING to reflect the changes to use the master branch and make explicit recommendations about updating CHANGELOG.md and providing test coverage. Also, this includes some old updates to PROJECTS.md that I wrote to expand the list of projects, pulling in things from old feature requests.
* | | | | | Add a CHANGELOG entry for the filebuf changeCarlos Martín Nieto2014-06-231-0/+5
| | | | | |
* | | | | | 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.