summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* config: add a ProgramData levelcmn/programdata-configCarlos Martín Nieto2015-10-219-10/+123
| | | | | This is where portable git stores the global configuration which we can use to adhere to it even though git isn't quite installed on the system.
* Merge pull request #3466 from libgit2/cmn/quick-parse-64Edward Thomson2015-10-153-4/+39
|\ | | | | revwalk: make commit list use 64 bits for time
| * revwalk: make commit list use 64 bits for timecmn/quick-parse-64Carlos Martín Nieto2015-10-143-4/+39
| | | | | | | | | | | | | | | | We moved the "main" parsing to use 64 bits for the timestamp, but the quick parsing for the revwalk did not. This means that for large timestamps we fail to parse the time and thus the walk. Move this parser to use 64 bits as well.
* | Merge pull request #3444 from ethomson/add_preserves_conflict_modeCarlos Martín Nieto2015-10-153-22/+171
|\ \ | | | | | | Preserve modes from a conflict in `git_index_insert`
| * | index: also try conflict mode when insertingEdward Thomson2015-09-303-23/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we do not trust the on-disk mode, we use the mode of an existing index entry. This allows us to preserve executable bits on platforms that do not honor them on the filesystem. If there is no stage 0 index entry, also look at conflicts to attempt to answer this question: prefer the data from the 'ours' side, then the 'theirs' side before falling back to the common ancestor.
| * | index: test that add_bypath preserves modeEdward Thomson2015-09-291-0/+23
| | |
* | | Merge pull request #3468 from libgit2/vmg/odb-lookupsVicent Marti2015-10-153-166/+175
|\ \ \ | | | | | | | | Fix pathological performance in ODB lookups
| * | | odb: Prioritize alternate backendsvmg/odb-lookupsVicent Marti2015-10-142-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For most real use cases, repositories with alternates use them as main object storage. Checking the alternate for objects before the main repository should result in measurable speedups. Because of this, we're changing the sorting algorithm to prioritize alternates *in cases where two backends have the same priority*. This means that the pack backend for the alternate will be checked before the pack backend for the main repository *but* both of them will be checked before any loose backends.
| * | | odb: Be smarter when refreshing backendsVicent Marti2015-10-142-154/+159
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current implementation of ODB backends, each backend is tasked with refreshing itself after a failed lookup. This is standard Git behavior: we want to e.g. reload the packfiles on disk in case they have changed and that's the reason we can't find the object we're looking for. This behavior, however, becomes pathological in repositories where multiple alternates have been loaded. Given that each alternate counts as a separate backend, a miss in the main repository (which can potentially be very frequent in cases where object storage comes from the alternate) will result in refreshing all its packfiles before we move on to the alternate backend where the object will most likely be found. To fix this, the code in `odb.c` has been refactored as to perform the refresh of all the backends externally, once we've verified that the object is nowhere to be found. If the refresh is successful, we then perform the lookup sequentially through all the backends, skipping the ones that we know for sure weren't refreshed (because they have no refresh API). The on-disk pack backend has been adjusted accordingly: it no longer performs refreshes internally.
* | | Merge pull request #3453 from libgit2/cmn/warn-pythonEdward Thomson2015-10-141-1/+6
|\ \ \ | |_|/ |/| | CMake: be more explicit with python errors
| * | CMake: be more explicit with python errorscmn/warn-pythonCarlos Martín Nieto2015-10-061-1/+6
| | | | | | | | | | | | | | | There's been a few reports of users not understanding what the python error means, so spell out the options they have.
* | | Merge pull request #3455 from Eun/masterCarlos Martín Nieto2015-10-071-0/+1
|\ \ \ | | | | | | | | Examples: network/fetch.c transfer_progress_cb - should return a value
| * | | fix returnEun2015-10-071-0/+1
|/ / /
* | | Merge pull request #3451 from ethomson/xdiffEdward Thomson2015-10-0616-155/+335
|\ \ \ | | | | | | | | xdiff fixes
| * | | blame: guard xdiff calls for large filesEdward Thomson2015-10-053-9/+29
| | | |
| * | | diff: don't feed large files to xdiffEdward Thomson2015-10-058-20/+23
| | | |
| * | | merge_file: treat large files as binaryEdward Thomson2015-10-055-82/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xdiff craps the bed on large files. Treat very large files as binary, so that it doesn't even have to try. Refactor our merge binary handling to better match git.git, which looks for a NUL in the first 8000 bytes.
| * | | xdiff: convert size variables to size_tEdward Thomson2015-10-053-50/+110
| | | |
| * | | GITERR_CHECK_ALLOC_ADDn: multi-arg addersEdward Thomson2015-10-051-0/+9
|/ / /
* | | Merge pull request #3447 from arthurschreiber/arthur/fix-odb-refdb-freeCarlos Martín Nieto2015-10-015-10/+10
|\ \ \ | | | | | | | | refdb and odb backends must provide `free` function
| * | | refdb and odb backends must provide `free` functionArthur Schreiber2015-10-015-10/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | As refdb and odb backends can be allocated by client code, libgit2 can’t know whether an alternative memory allocator was used, and thus should not try to call `git__free` on those objects. Instead, odb and refdb backend implementations must always provide their own `free` functions to ensure memory gets freed correctly.
* | | Merge pull request #3446 from ethomson/portabilityCarlos Martín Nieto2015-09-303-14/+38
|\ \ \ | | | | | | | | portability: use `CHECK_FUNCTION_EXISTS` for checking whether functions exist...
| * | | qsort_r/qsort_s: detect their supportEdward Thomson2015-09-302-18/+23
| | | |
| * | | p_futimes: support using futimens when availableEdward Thomson2015-09-302-1/+20
| | | |
* | | | Merge pull request #3445 from libgit2/cmn/ssl-nullEdward Thomson2015-09-301-1/+6
|\ \ \ \ | |_|/ / |/| | | openssl: don't try to teardown an unconnected SSL context
| * | | openssl: don't try to teardown an unconnected SSL contextcmn/ssl-nullCarlos Martín Nieto2015-09-301-1/+6
|/ / / | | | | | | | | | | | | | | | SSL_shutdown() does not like it when we pass an unitialized ssl context to it. This means that when we fail to connect to a host, we hide the error message saying so with OpenSSL's indecipherable error message.
* | | Merge pull request #3411 from spraints/custom-push-headersCarlos Martín Nieto2015-09-3016-26/+197
|\ \ \ | | | | | | | | Include custom HTTP headers
| * | | Copy custom_headers insteach of referencing the caller's copyMatt Burke2015-09-255-24/+26
| | | |
| * | | These can be staticMatt Burke2015-09-242-4/+4
| | | |
| * | | Revise custom header error messagesMatt Burke2015-09-241-40/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the header doesn't look like a header (e.g. if it doesn't have a ":" or if it has newlines), report "custom HTTP header '%s' is malformed". If the header has the same name as a header already set by libgit2 (e.g. "Host"), report "HTTP header '%s' is already set by libgit2".
| * | | Don't null-checkMatt Burke2015-09-241-3/+0
| | | |
| * | | Use an array of forbidden custom headersMatt Burke2015-09-241-9/+12
| | | |
| * | | Avoid segfault when opts == NULLMatt Burke2015-09-101-3/+8
| | | |
| * | | Add a test for custom header validationMatt Burke2015-09-102-6/+39
| | | | | | | | | | | | | | | | Also, *some* custom headers actually are valid.
| * | | More specific namesMatt Burke2015-09-101-4/+4
| | | |
| * | | Validate custom http headersMatt Burke2015-09-101-0/+53
| | | |
| * | | Ignore NULL headersMatt Burke2015-09-102-11/+14
| | | |
| * | | Accept custom headers for fetch tooMatt Burke2015-09-102-2/+11
| | | |
| * | | o iMatt Burke2015-09-081-0/+1
| | | |
| * | | Update another call to git_remote_connectMatt Burke2015-09-081-1/+1
| | | |
| * | | Teach winhttp about the extra headersMatt Burke2015-09-081-0/+17
| | | |
| * | | Hook up the custom_headers to the http transportMatt Burke2015-09-083-4/+16
| | | |
| * | | Tell the git_transport about the custom_headersMatt Burke2015-09-0810-24/+43
| | | |
| * | | Add custom_headers to git_push_optionsMatt Burke2015-09-081-0/+5
| | | |
| * | | Drop extra_http_headers from git_remoteMatt Burke2015-09-085-18/+0
| | | |
| * | | Allow the world to set HTTP headers for remotesMatt Burke2015-09-044-3/+16
| | | |
| * | | Pull extra_http_headers from the git_remoteMatt Burke2015-09-043-0/+4
| | | |
| * | | Put the extra headers on the connection_data insteadMatt Burke2015-09-042-4/+4
| | | |
| * | | Add more headers to HTTP requestsMatt Burke2015-09-041-0/+9
| | | |
* | | | Merge pull request #3443 from libgit2/longpath-printfCarlos Martín Nieto2015-09-291-2/+0
|\ \ \ \ | |_|_|/ |/| | | win32::longpath: don't print path
View Lorry Controller Status