summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* pack: return the correct final offsetcmn/unpack-offsetCarlos Martín Nieto2014-08-261-1/+1
| | | | | | | | | | The callers of git_packfile_unpack() expect the obj_offset argument to be set to the beginning of the next object. We were mistakenly returning the the offset of the object's data, which causes the CRC function to try to use the wrong offset. Set obj_offset to curpos instead of elem->offset to point to the next element and bring back expected behaviour.
* Merge pull request #2532 from arthurschreiber/arthur/fix-merge-base-commit-checkVicent Marti2014-08-251-1/+4
|\ | | | | merge base: Correctly raise an error if a non-commit object is passed.
| * merge base: Correctly raise an error if a non-commit object is passed.Arthur Schreiber2014-08-251-1/+4
| |
* | Merge pull request #2531 from libgit2/rb/mkdir-allow-parent-failuresVicent Marti2014-08-251-3/+5
|\ \ | | | | | | Allow mkdir helper to skip parent errors
| * | Allow mkdir helper to skip parent errorsrb/mkdir-allow-parent-failuresRussell Belfer2014-08-221-3/+5
| |/ | | | | | | | | | | | | 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 #2527 from jacquesg/refspec-crashVicent Marti2014-08-251-2/+14
|\ \ | |/ |/| Check if the refspec matches before transforming
| * Check that the refspec matches before modifying the out bufferJacques Germishuys2014-08-211-6/+6
| |
| * Check if the refspec matches before transformingJacques Germishuys2014-08-171-2/+14
| |
* | Merge pull request #2528 from libgit2/vmg/tostr_sVicent Marti2014-08-183-0/+20
|\ \ | | | | | | Export `git_oid_tostr_s` instead of `_allocfmt`
| * | oid: Export `git_oid_tostr_s` instead of `_allocfmt`vmg/tostr_sVicent Marti2014-08-183-0/+20
| | | | | | | | | | | | | | | | | | 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.
* | | 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.
* | git_remote_ls() should return an error if the transport is not availableJacques Germishuys2014-08-151-0/+7
| |
* | Introduce proper http authentication APIEdward Thomson2014-08-155-282/+528
| |
* | Add GSSAPI support for SPNEGO/Kerberos auth over HTTPEdward Thomson2014-08-151-30/+287
| |
* | Introduce git_buf_decode_base64Edward Thomson2014-08-155-15/+63
| | | | | | | | Decode base64-encoded text into a git_buf
* | Perform HTTP keep-aliveEdward Thomson2014-08-151-3/+12
| |
* | Custom transport: minor cleanupsEdward Thomson2014-08-144-62/+89
| | | | | | | | | | | | | | | | | | | | | | | | * 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://").
* | Allow NULL error message prefix when class=GITERR_OSEdward Thomson2014-08-131-7/+9
|/
* config: a multiline var can start immediatelyCarlos Martín Nieto2014-08-091-1/+1
| | | | | | | | | | | | | | | | | 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.
* | Don't report status on named pipesRussell Belfer2014-08-081-11/+12
| | | | | | | | | | 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-0711-124/+145
|\ \ | |/ |/| 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
| |
| * 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
| |
* | 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-237-12/+57
|\ \ \ | | | | | | | | Fix git status list new unreadable folder
| * | | undo indentation change in diff_print.cfix-git-status-list-new-unreadable-folderAlan Rogers2014-07-231-9/+9
| | | |
| * | | Merge remote-tracking branch 'origin/master' into ↵Alan Rogers2014-07-2239-379/+719
| |\ \ \ | | |/ / | | | | | | | | fix-git-status-list-new-unreadable-folder
| * | | Remove debug printfs.Alan Rogers2014-07-221-2/+0
| | | |
| * | | Merge remote-tracking branch 'origin/development' into ↵Alan Rogers2014-07-1012-164/+276
| |\ \ \ | | | | | | | | | | | | | | | fix-git-status-list-new-unreadable-folder
| * \ \ \ Merge remote-tracking branch 'origin/development' into ↵Alan Rogers2014-06-0455-605/+1413
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix-git-status-list-new-unreadable-folder Conflicts: include/git2/diff.h
| * | | | | Clear out the struct.Alan Rogers2014-06-041-0/+1
| | | | | |
| * | | | | Implement GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKEDAlan Rogers2014-06-041-1/+4
| | | | | |
| * | | | | GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKEDAlan Rogers2014-06-031-0/+2
| | | | | |
| * | | | | Add GIT_STATUS_OPT_INCLUDE_UNREADABLEAlan Rogers2014-05-301-0/+2
| | | | | |
| * | | | | Don't need to duplicate this code.Alan Rogers2014-05-231-5/+1
| | | | | |
| * | | | | Return GIT_DELTA_UNREADABLE for a file with a mode changeAlan Rogers2014-05-221-0/+5
| | | | | |
| * | | | | Remove errant whitespace.Alan Rogers2014-05-211-1/+1
| | | | | |
| * | | | | Return GIT_FILEMODE_UNREADABLE for files that fail to stat.Alan Rogers2014-05-212-18/+24
| | | | | |
| * | | | | Start adding GIT_DELTA_UNREADABLE and GIT_STATUS_WT_UNREADABLE.Alan Rogers2014-05-206-19/+47
| | | | | |
View Lorry Controller Status