Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | push: reword comment on finish()cmn/push-error-concerns | Carlos Martín Nieto | 2014-12-10 | 1 | -5/+7 |
| | | | | This should make it clearer what the return value implies. | ||||
* | push: fold unpack_ok() into finish() | Carlos Martín Nieto | 2014-12-10 | 5 | -26/+10 |
| | | | | | The push cannot be successful if we sent a bad packfile. We should return an error in that case instead of storing it elsewhere. | ||||
* | Merge pull request #2678 from libgit2/cmn/io-stream | Edward Thomson | 2014-12-10 | 12 | -612/+857 |
|\ | | | | | Introduce stackable IO streams | ||||
| * | Fix a couple of compiler warnings | Carlos Martín Nieto | 2014-12-10 | 2 | -2/+2 |
| | | |||||
| * | stream: constify the write buffer | Carlos Martín Nieto | 2014-12-10 | 4 | -4/+4 |
| | | |||||
| * | gitno: remove code which is no longer needed | Carlos Martín Nieto | 2014-12-10 | 5 | -500/+17 |
| | | | | | | | | | | | | Most of the network-facing facilities have been copied to the socket and openssl streams. No code now uses these functions directly anymore, so we can now remove them. | ||||
| * | ssh: use socket_stream to perform the connection | Carlos Martín Nieto | 2014-12-10 | 1 | -8/+12 |
| | | | | | | | | | | | | | | | | Having an ssh stream would require extra work for stream capabilities we don't need anywhere else (oob auth and command execution) so for now let's move away from the gitno connection to use socket_stream. We can introduce an ssh stream interface if and as we need it. | ||||
| * | Port HTTP(S) to the new stream API | Carlos Martín Nieto | 2014-12-10 | 1 | -61/+39 |
| | | |||||
| * | Port the TCP transport to the new stream API | Carlos Martín Nieto | 2014-12-10 | 3 | -57/+93 |
| | | |||||
| * | Add an OpenSSL IO stream | Carlos Martín Nieto | 2014-12-10 | 4 | -15/+418 |
| | | | | | | | | | | | | | | This unfortunately isn't as stackable as could be possible, as it hard-codes the socket stream. This is because the method of using a custom openssl BIO is not clear, and we do not need this for now. We can still bring this in if and as we need it. | ||||
| * | Introduce stackable IO streams | Carlos Martín Nieto | 2014-12-10 | 3 | -0/+307 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently have gitno for talking over TCP, but this needs to know about both plaintext and OpenSSL connections and the code has gotten somewhat messy with ifdefs determining which version of the function should be called. In order to clean this up and abstract away the details of sending over the different types of streams, we can instead use an interface and stack stream implementations. We may not be able to use the stackability with all streams, but we are definitely be able to use the abstraction which is currently spread between different bits of gitno. | ||||
* | | Merge pull request #2755 from libgit2/ntk/readme_appveyor_build | Carlos Martín Nieto | 2014-12-10 | 1 | -3/+4 |
|\ \ | | | | | | | Minor Readme improvments | ||||
| * | | readme: Add AppVeyor build status badge/link | nulltoken | 2014-12-10 | 1 | -0/+1 |
| | | | |||||
| * | | readme: Make Travis build status badge reflect the state of master | nulltoken | 2014-12-10 | 1 | -1/+1 |
| | | | |||||
| * | | readme: Trim trailing lines | nulltoken | 2014-12-10 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #2753 from ethomson/win32_leaks | Carlos Martín Nieto | 2014-12-10 | 5 | -55/+122 |
|\ \ | | | | | | | Win32 leaks | ||||
| * | | winhttp: plug some leaks | Edward Thomson | 2014-12-09 | 1 | -47/+67 |
| | | | |||||
| * | | core::link test: clean up junction point name | Edward Thomson | 2014-12-09 | 1 | -7/+50 |
| | | | |||||
| * | | win32: remember to free wide env name/value | Edward Thomson | 2014-12-09 | 1 | -1/+3 |
| | | | |||||
| * | | win32: remember to cleanup our hash_ctx | Edward Thomson | 2014-12-09 | 2 | -0/+2 |
|/ / | |||||
* | | Merge pull request #2750 from linquize/generate.py | Edward Thomson | 2014-12-08 | 1 | -5/+5 |
|\ \ | | | | | | | Update clar to e3985dd | ||||
| * | | Update clar to e3985dd | Linquize | 2014-12-07 | 1 | -5/+5 |
| | | | |||||
* | | | Merge pull request #2751 from linquize/broken-test-win | Edward Thomson | 2014-12-08 | 3 | -3/+22 |
|\ \ \ | |/ / |/| | | Fix broken tests on Windows | ||||
| * | | Fix broken merge tests due to autocrlf was not false | Linquize | 2014-12-07 | 2 | -0/+20 |
| | | | |||||
| * | | Fix broken test suite on Windows | Linquize | 2014-12-07 | 1 | -3/+2 |
|/ / | |||||
* | | Merge pull request #2746 from libgit2/cmn/neg-ignore-dir | Edward Thomson | 2014-12-06 | 2 | -8/+100 |
|\ \ | | | | | | | Fix negative ignores withing ignored dirs | ||||
| * | | ignore: match git's rule negation rulescmn/neg-ignore-dir | Carlos Martín Nieto | 2014-12-05 | 1 | -3/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A rule can only negate something which was explicitly mentioned in the rules before it. Change our parsing to ignore a negative rule which does not negate something mentioned in the rules above it. While here, fix a wrong allocator usage. The memory for the match string comes from pool allocator. We must not free it with the general allocator. We can instead simply forget the string and it will be cleaned up. | ||||
| * | | ignore: adjust test for negating inside a dir | Carlos Martín Nieto | 2014-12-05 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given top !top/foo in an ignore file, we should not unignore top/foo. This is an implementation detail of the git code leaking, but that's the behaviour we should show. A negation rule can only negate an exact rule it has seen before. | ||||
* | | | Merge pull request #2748 from libgit2/cmn/doc-all | Edward Thomson | 2014-12-06 | 18 | -29/+127 |
|\ \ \ | | | | | | | | | doc: add documentation to all the public structs and enums | ||||
| * | | | doc: add documentation to all the public structs and enumscmn/doc-all | Carlos Martín Nieto | 2014-12-06 | 18 | -29/+127 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes them show up in the reference, even if the text itself isn't the most descriptive. These have been found with grep -Przon '\n\ntypedef struct.*?\{' -- include grep -Przon '\n\ntypedef enum.*?\{' -- include | ||||
* | | | Merge pull request #2730 from libgit2/cmn/local-push | Edward Thomson | 2014-12-05 | 3 | -12/+42 |
|\ \ \ | | | | | | | | | Adjust the local transport for the common refspec parser | ||||
| * | | | local: adjust to the common refspec parsercmn/local-push | Carlos Martín Nieto | 2014-11-23 | 1 | -11/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer have NULL strings, but empty ones and duplicate the sides if necessar, so the first check will never do anything. While in the area, remove unnecessary ifs and early returns. | ||||
| * | | | remote: add test for pushing and deleting with the local transport | Carlos Martín Nieto | 2014-11-23 | 1 | -0/+34 |
| | | | | |||||
| * | | | remote: verify there is a push foreach callback set | Carlos Martín Nieto | 2014-11-23 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #2747 from libgit2/cmn/notes-consistency | Edward Thomson | 2014-12-05 | 8 | -21/+22 |
|\ \ \ \ | |_|/ / |/| | | | Notes API consistency fixes | ||||
| * | | | notes: fix comments for git_note_next()cmn/notes-consistency | Carlos Martín Nieto | 2014-12-06 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | The iterator is the last argument. There is also no returned notes, just ids, so the comment about freeing is out of place. | ||||
| * | | | notes: move the notes name argument | Carlos Martín Nieto | 2014-12-06 | 8 | -17/+20 |
|/ / / | | | | | | | | | | | | | Make it consistent between git_note_create() and git_note_remote() by putting it after the repository. | ||||
* | | | Rever spelling fixes for dependencies | Carlos Martín Nieto | 2014-12-05 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | This is not our code and it adds unecessary changes from the upstream code. | ||||
* | | | Merge pull request #2744 from epmatsw/spelling | nulltoken | 2014-12-05 | 22 | -23/+23 |
|\ \ \ | | | | | | | | | Spelling fixes | ||||
| * | | | Spelling fixes | Will Stamper | 2014-12-04 | 22 | -23/+23 |
| | | | | |||||
* | | | | Merge pull request #2743 from ethomson/init_val | Carlos Martín Nieto | 2014-12-05 | 4 | -18/+58 |
|\ \ \ \ | |/ / / |/| | | | init: return the number of initializations | ||||
| * | | | init: return the number of initializations | Edward Thomson | 2014-12-04 | 4 | -18/+58 |
| | | | | |||||
* | | | | Merge pull request #2742 from stewid/add_missing_else_directive | Carlos Martín Nieto | 2014-12-03 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Add missing else directive | ||||
| * | | | Add missing else directive | Stefan Widgren | 2014-12-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | Add missing else directive to fix compiler warning: control reaches end of non-void function | ||||
* | | | | Merge pull request #2741 from ethomson/fetch-twice | Carlos Martín Nieto | 2014-12-03 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | win32: clear connection data on close | ||||
| * | | | win32: clear connection data on close | Edward Thomson | 2014-12-03 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #2734 from jeffhostetler/jeffhostetler/git_mkfile | Edward Thomson | 2014-12-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix cl_git_mkfile() to test for -1 rather than 0 for errors from p_creat... | ||||
| * | | | fix cl_git_mkfile() to test for -1 rather than 0 for errors from p_creat() | Jeff Hostetler | 2014-11-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #2736 from ethomson/describe_errorcode | Carlos Martín Nieto | 2014-11-30 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | describe: check error codes | ||||
| * | | | describe: check error codes | Edward Thomson | 2014-11-29 | 1 | -2/+2 |
|/ / / |