summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow mkdir helper to skip parent errorsrb/mkdir-allow-parent-failuresRussell Belfer2014-08-222-3/+36
| | | | | | | Our mkdir helper was failing is a parent directory was not accessible even if the child directory could be created. This changes the helper to keep trying child directories even when the parent is unwritable.
* Merge pull request #2528 from libgit2/vmg/tostr_sVicent Marti2014-08-187-18/+33
|\ | | | | Export `git_oid_tostr_s` instead of `_allocfmt`
| * oid: Export `git_oid_tostr_s` instead of `_allocfmt`vmg/tostr_sVicent Marti2014-08-187-18/+33
| | | | | | | | | | | | The old `allocfmt` is of no use to callers, as they are not able to free the returned buffer. Export a new API that returns a static string that doesn't need to be freed.
* | Revert "test: Remove symlinks from the source tree"Vicent Marti2014-08-181-0/+1
| | | | | | | | This reverts commit 0dc54e149498bbd5de5e5ecc6006f9f5afb6588c.
* | test: Remove symlinks from the source treeVicent Marti2014-08-181-1/+0
| | | | | | | | We don't really use this at all, and it breaks packaging in Windows.
* | Merge pull request #2525 from libgit2/cmn/http-recv-bufferVicent Marti2014-08-181-4/+20
|\ \ | | | | | | http: make sure we can consume the data we request
| * | http: make sure we can consume the data we requestcmn/http-recv-bufferCarlos Martín Nieto2014-08-161-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recv buffer (parse_buffer) and the buffer have independent sizes and offsets. We try to fill in parse_buffer as much as possible before passing it to the http parser. This is fine most of the time, but fails us when the buffer is almost full. In those situations, parse_buffer can have more data than we would be able to put into the buffer (which may be getting full if we're towards the end of a data sideband packet). To work around this, we check if the space we have left on our buffer is smaller than what could come from the network. If this happens, we make parse_buffer think that it has as much space left as our buffer, so it won't try to retrieve more data than we can deal with. As the start of the data may no longer be at the start of the buffer, we need to keep track of where it really starts (data_offset) and use that in our calculations for the real size of the data we received from the network. This fixes #2518.
* | | Merge pull request #2523 from leighlondon/remove-completed-projectVicent Marti2014-08-181-3/+0
|\ \ \ | |/ / |/| | Removing a completed starter project.
| * | Removing a completed starter project.Leigh London2014-08-161-3/+0
|/ / | | | | | | | | | | Removing the starter project for adding support for the symref extension (#2006) from PROJECTS.md, as this seems to have been completed with the merge of #2376.
* | Merge pull request #2521 from jacquesg/remote-ls-not-connectedVicent Marti2014-08-152-0/+18
|\ \ | | | | | | git_remote_ls() crashes before connect is called
| * | git_remote_ls() should return an error if the transport is not availableJacques Germishuys2014-08-152-0/+18
|/ /
* | Merge pull request #2497 from ethomson/kerberos3Vicent Marti2014-08-1514-98/+1048
|\ \ | | | | | | SPNEGO authentication via GSSAPI
| * | Introduce proper http authentication APIEdward Thomson2014-08-156-283/+529
| | |
| * | Add GSSAPI support for SPNEGO/Kerberos auth over HTTPEdward Thomson2014-08-153-30/+622
| | |
| * | Introduce git_buf_decode_base64Edward Thomson2014-08-156-23/+92
| | | | | | | | | | | | Decode base64-encoded text into a git_buf
| * | Perform HTTP keep-aliveEdward Thomson2014-08-151-3/+12
| | |
| * | online::clone::credentials support default credentialsEdward Thomson2014-08-151-3/+26
| | |
| * | Free references during push validationEdward Thomson2014-08-151-0/+2
| | |
| * | Remove the refs/notes/commits that we push in testEdward Thomson2014-08-141-0/+9
| | | | | | | | | | | | | | | | | | | | | The online::push::notes test pushes a note but leaves it hanging around for other tests to stumble across when they're validating that they're seeing the refs they expect to see. Clean it up on exit.
| * | Don't run the ssh clone tests against http remotesEdward Thomson2014-08-141-1/+1
|/ /
* | Merge pull request #2469 from ethomson/transport2Vicent Marti2014-08-1411-410/+461
|\ \ | | | | | | Custom transport: minor cleanups
| * | Custom transport: minor cleanupsEdward Thomson2014-08-1411-410/+461
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move the transport registration mechanisms into a new header under 'sys/' because this is advanced stuff. * Remove the 'priority' argument from the registration as it adds unnecessary complexity. (Since transports cannot decline to operate, only the highest priority transport is ever executed.) Users who require per-priority transports can implement that in their custom transport themselves. * Simplify registration further by taking a scheme (eg "http") instead of a prefix (eg "http://").
* | | Merge pull request #2517 from ethomson/no_win_unreadableVicent Marti2014-08-131-0/+4
|\ \ \ | | | | | | | | Don't include the unreadable tests on win32
| * | | Don't include the unreadable tests on win32Edward Thomson2014-08-131-0/+4
| |/ /
* | | Merge pull request #2513 from ethomson/giterr_null_msgVicent Marti2014-08-131-7/+9
|\ \ \ | |/ / | | / | |/ |/| Allow NULL error message prefix when class=GITERR_OS
| * Allow NULL error message prefix when class=GITERR_OSEdward Thomson2014-08-131-7/+9
|/
* Merge pull request #2509 from libgit2/cmn/immediate-multilineVicent Marti2014-08-092-1/+14
|\ | | | | config: a multiline var can start immediately
| * config: a multiline var can start immediatelyCarlos Martín Nieto2014-08-092-1/+14
|/ | | | | | | | | | | | | | | | | In the check for multiline, we traverse the backslashes from the end backwards and int the end assert that we haven't gone past the beginning of the line. We make sure of this in the loop condition, but we also check in the return value. However, for certain configurations, a line in a multiline variable might be empty to aid formatting. In that case, 'end' == 'start', since we ended up looking at the first char which made it a multiline. There is no need for the (end > start) check in the return, since the loop guarantees we won't go further back than the first char in the line, and we do accept the first char to be the final backslash. This fixes #2483.
* Merge pull request #2507 from libgit2/rb/timer-typoVicent Marti2014-08-091-3/+3
|\ | | | | Typo in timer constants
| * Fix typo in timer normalization constantsrb/timer-typoRussell Belfer2014-08-051-3/+3
| | | | | | | | | | The effect of this would be that various update callbacks would not be made at the correct interval.
* | Merge pull request #2506 from libgit2/rb/ignore-pipes-etcVicent Marti2014-08-082-11/+44
|\ \ | | | | | | Don't report status on named pipes
| * | Don't report status on named pipesRussell Belfer2014-08-082-11/+44
|/ / | | | | | | | | Git skips entries in directories that are not S_ISDIR, S_ISREG, or S_ISLNK, so let's make libgit2 do the same thing.
* | Merge pull request #2471 from jacquesg/compatibility-cleanupVicent Marti2014-08-0715-136/+158
|\ \ | | | | | | Compatibility/Portability cleanup
| * | Introduce some consistency in definition/declaration orderingJacques Germishuys2014-08-052-17/+17
| | |
| * | Move p_realpath logic to realpath.cJacques Germishuys2014-08-052-14/+9
| | |
| * | Use p_snprintf also in testsJacques Germishuys2014-08-054-12/+13
| | |
| * | Consistently use p_snprintfJacques Germishuys2014-08-053-12/+13
| | |
| * | Cleanup portability/compatibility layerJacques Germishuys2014-08-057-90/+106
| | | | | | | | | | | | | | | | | | | | | * Removes mingw-compat.h * Cleans up separation of compiler/platform idiosyncrasies * Unifies mingw/msvc stat structures and functions * (Tries to) hide more compiler specific implementation details (even in our internal API)
| * | Define WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH if not definedJacques Germishuys2014-08-051-0/+4
| | |
| * | Silence unused variables warningsJacques Germishuys2014-08-052-0/+4
| | |
| * | Only create openssl_locks if thread support is enabledJacques Germishuys2014-07-131-0/+2
| | |
| * | Fix unix/posix.h include guardJacques Germishuys2014-07-131-2/+2
| | |
* | | Merge pull request #2503 from jacquesg/solaris-http-parserVicent Marti2014-08-051-0/+2
|\ \ \ | |_|/ |/| | Solaris doesn't necessarily have stdint.h, use inttypes.h
| * | Solaris doesn't necessarily have stdint.h, use inttypes.hJacques Germishuys2014-08-051-0/+2
|/ /
* | Merge pull request #2487 from libgit2/cmn/revwalk-no-preallocVicent Marti2014-07-252-4/+1
|\ \ | | | | | | Work around strict aliasing in array growth
| * | array: mark the array to grow as volatilecmn/revwalk-no-preallocCarlos Martín Nieto2014-07-251-1/+1
| | | | | | | | | | | | | | | | | | This works around strict aliasing rules letting some versions of GCC (particularly on RHEL 6) thinking that they can skip updating the size of the array when calculating the next element's offset.
| * | revwalk: remove preallocation of the uninteresting commitsCarlos Martín Nieto2014-07-241-3/+0
|/ / | | | | | | | | | | | | | | | | | | Preallocating two commits doesn't make much sense as leaving allocation to the first array usage will allocate a sensible size with room for growth. This preallocation has also been hiding issues with strict aliasing in the tests, as we have fairly simple histories and never trigger the growth.
* | Merge pull request #2477 from ethomson/mergeVicent Marti2014-07-231-2/+1
|\ \ | | | | | | Don't allow conflicts by default
| * | Don't allow conflicts by defaultEdward Thomson2014-07-171-2/+1
| | |
* | | Merge pull request #2484 from libgit2/fix-git-status-list-new-unreadable-folderVicent Marti2014-07-2312-32/+189
|\ \ \ | | | | | | | | Fix git status list new unreadable folder