summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Export git_buf_text_is_binary and git_buf_text_contains_nul.expose-buffer-binary-detectionjoshaber2014-07-154-18/+46
| | | | So that users don’t need to implement binary detection themselves.
* Merge pull request #2472 from jacquesg/perl-linkVicent Marti2014-07-151-1/+1
|\ | | | | Update perl bindings link
| * Updated perl bindings linkJacques Germishuys2014-07-131-1/+1
| |
* | Merge pull request #2474 from ethomson/clar_file_reportVicent Marti2014-07-151-1/+1
|\ \ | |/ |/| Switch description and message reporting in `clar__assert_equal_file`
| * Switch description and path reportingEdward Thomson2014-07-151-1/+1
|/
* Merge pull request #2466 from jacquesg/win2003-platform-sdkVicent Marti2014-07-117-8/+23
|\ | | | | Windows compatibility fixes
| * Define IO_REPARSE_TAG_SYMLINK if its not defined by WinNT.hJacques Germishuys2014-07-061-0/+4
| |
| * Secure CRT is only available from Visual Studio 2005+Jacques Germishuys2014-07-062-3/+3
| |
| * qsort_r is only available from Visual Studio 2005+Jacques Germishuys2014-07-061-1/+2
| |
| * Variadic macros is only available from Visual Studio 2005+Jacques Germishuys2014-07-062-2/+10
| |
| * _stat64 is a function, __stat64 is the structureJacques Germishuys2014-07-061-1/+1
| |
| * strnlen() is only available from Visual Studio 2005+Jacques Germishuys2014-07-061-1/+2
| |
| * in_addr is defined in <Winsock2.h>, include before <ws2tcpip.h>Jacques Germishuys2014-07-061-0/+1
| |
* | Merge pull request #2463 from libgit2/cmn/ssh-factory-for-pathsVicent Marti2014-07-115-3/+141
|\ \ | | | | | | ssh: provide a factory function for setting ssh paths
| * | ssh: provide a factory function for setting ssh pathscmn/ssh-factory-for-pathsCarlos Martín Nieto2014-07-075-3/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | git allows you to set which paths to use for the git server programs when connecting over ssh; and we want to provide something similar. We do this by providing a factory function which can be set as the remote's transport callback which will set the given paths upon creation.
* | | Merge pull request #2465 from libgit2/cmn/refspec-start-middleVicent Marti2014-07-113-18/+68
|\ \ \ | | | | | | | | Support refspecs with the asterisk in the middle
| * | | Add a CHANGELOG entry for refspecs with asterisk in the middlecmn/refspec-start-middleCarlos Martín Nieto2014-07-041-0/+3
| | | |
| * | | refspec: support asterisks in the middle of a patternCarlos Martín Nieto2014-07-042-18/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to assume a refspec would only have an asterisk in the middle of their respective pattern. This has not been a valid assumption for some time now with git. Instead of assuming where the asterisk is going to be, change the logic to treat each pattern as having two halves with a replacement bit in the middle, where the asterisk is.
| * | | refspec: short-circuit non-pattern refspecs on transformCarlos Martín Nieto2014-07-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | When transforming a non-pattern refspec, we simply need to copy over the opposite string. Move that logic up to the wrapper so we can assume a pattern refspec in the transformation function.
* | | | Merge pull request #2468 from Airbitz/pack-error-reportingCarlos Martín Nieto2014-07-111-1/+1
|\ \ \ \ | | | | | | | | | | Properly report failure when expanding a packfile
| * | | | Properly report failure when expanding a packfileWilliam Swanson2014-07-091-1/+1
| | | | |
* | | | | Merge pull request #2457 from ethomson/merge_fixCarlos Martín Nieto2014-07-111-3/+4
|\ \ \ \ \ | | | | | | | | | | | | merge: don't open COMMIT_MSG unless we need to append conflicts
| * | | | | merge: don't open COMMIT_MSG unless we need to append conflictsEdward Thomson2014-07-081-3/+4
| |/ / / /
* | | | | checkout: fix docs formatting for the optionsCarlos Martín Nieto2014-07-111-12/+12
|/ / / /
* | | | Documentation fixesCarlos Martín Nieto2014-07-082-13/+20
| |/ / |/| | | | | | | | | | | | | | | | | | | | Fixup git_attr_value's comment to be recognised as documentation, and include the definitions needed for clang to parse reset.h such that it shows up in the documentation. This fixes #2430.
* | | Merge remote-tracking branch 'origin/cmn/update-zlib'Vicent Marti2014-07-0415-449/+1350
|\ \ \ | |/ / |/| |
| * | zlib: disable warning 4142 on MSVCcmn/update-zlibCarlos Martín Nieto2014-06-111-0/+1
| | | | | | | | | | | | This is about benign redefinition of types. We're not interested in it.
| * | zlib: get rid of compress.c and uncompr.cCarlos Martín Nieto2014-06-112-139/+0
| | |
| * | zlib: get rid of gz*Carlos Martín Nieto2014-06-116-2042/+0
| | |
| * | zlib: add a few missing definesCarlos Martín Nieto2014-06-111-0/+3
| | |
| * | Merge branch 'cmn/zlib-update' into cmn/update-zlibCarlos Martín Nieto2014-06-1121-449/+3527
| |\ \
| | * \ Merge branch 'cmn/zlib-128' into cmn/zlib-updateCarlos Martín Nieto2014-06-1121-449/+3527
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: deps/zlib/crc32.c deps/zlib/crc32.h deps/zlib/zconf.h
| | | * | Update zlib to 1.2.8Carlos Martín Nieto2014-06-1122-458/+4502
| | | | |
* | | | | Merge pull request #2461 from jacquesg/ssh2-warningsCarlos Martín Nieto2014-07-042-3/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix SSH2 warnings
| * | | | Include libssh2.h before git2.h (transport.h)Jacques Germishuys2014-07-031-2/+4
| | | | |
| * | | | Fix git_cred_ssh_interactive_callback signatureJacques Germishuys2014-07-031-1/+1
|/ / / /
* | | | Merge pull request #2460 from libgit2/cmn/sched-yieldVicent Marti2014-07-032-7/+14
|\ \ \ \ | | | | | | | | | | Move yield to the tests and enable for FreeBSD
| * | | | Move yield to the tests and enable for FreeBSDcmn/sched-yieldCarlos Martín Nieto2014-07-032-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the definition of git_thread_yield() to the test which needs it and add the correct definition for it for FreeBSD and derivatives. Original patch adding FreeBSD and derivatives by @jacquesg.
* | | | | Merge pull request #2459 from libgit2/cmn/http-url-pathVicent Marti2014-07-032-0/+21
|\ \ \ \ \ | | | | | | | | | | | | netops: error out on url without a path
| * | | | | netops: error out on url without a pathcmn/http-url-pathCarlos Martín Nieto2014-07-032-0/+21
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | In order to connect to a remote server, we need to provide a path to the repository we're interested in. Consider the lack of path in the url an error.
* | | | | 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
View Lorry Controller Status