summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* merge: expose multiple merge basescmn/oidarrayCarlos Martín Nieto2014-07-277-1/+169
| | | | | | | | We always calculate multiple merge bases, but up to now we had only exposed the "best" merge base. Introduce git_oidarray which analogously to git_strarray lets us return multiple ids.
* Merge pull request #2475 from libgit2/expose-buffer-binary-detectionVicent Marti2014-07-162-0/+27
|\ | | | | Export git_buf_text_is_binary and git_buf_text_contains_nul.
| * Just put it all in buffer.joshaber2014-07-166-46/+45
| |
| * 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 #2476 from linquize/config-lf-eofVicent Marti2014-07-162-3/+19
|\ \ | | | | | | When adding new config section, handle config file not ending with LF
| * | Add unit test to test add section without lf at EOFLinquize2014-07-161-0/+16
| | |
| * | Make sure \n is at the end of config file before a new section is writtenLinquize2014-07-161-3/+3
| |/
* | ssh: Fix unused warningVicent Marti2014-07-161-0/+1
| |
* | clone: should_clone? Of course we should clone. That's not the questionVicent Marti2014-07-161-4/+4
| |
* | Merge pull request #2467 from ethomson/win_local_cloneVicent Marti2014-07-164-60/+93
|\ \ | |/ |/| Handle local file:/// paths on Windows
| * Handle local file:/// paths on WindowsEdward Thomson2014-07-114-60/+93
| | | | | | | | | | Windows can't handle a path like `/c:/foo`; when turning file:/// URIs into local paths, we must strip the leading slash.
* | 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.
View Lorry Controller Status