summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | patch parse: unset path prefixEdward Thomson2016-05-261-0/+4
| | | |
| * | | apply: move patch data to patch_common.hEdward Thomson2016-05-263-2/+2
| | | |
| * | | patch: use delta's old_file/new_file membersEdward Thomson2016-05-264-56/+27
| | | | | | | | | | | | | | | | | | | | No need to replicate the old_file/new_file members, or plumb them strangely up.
| * | | patch: abstract patches into diff'ed and parsedEdward Thomson2016-05-2613-1361/+1408
| | | | | | | | | | | | | | | | | | | | | | | | Patches can now come from a variety of sources - either internally generated (from diffing two commits) or as the results of parsing some external data.
| * | | patch parsing: ensure empty patches are illegalEdward Thomson2016-05-261-0/+8
| | | |
| * | | patch parsing: parse binary patch filesEdward Thomson2016-05-262-64/+268
| | | |
| * | | zstream: fail when asked to inflate garbageEdward Thomson2016-05-262-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we are provided some input buffer (with a length) to inflate, and it contains more data than simply the deflated data, fail. zlib will helpfully tell us when it is done reading (via Z_STREAM_END), so if there is data leftover in the input buffer, fail lest we continually try to inflate it.
| * | | git_buf: decode base85 inputsEdward Thomson2016-05-263-20/+149
| | | |
| * | | patch application: apply binary patchesEdward Thomson2016-05-265-15/+336
| | | | | | | | | | | | | | | | | | | | | | | | Handle the application of binary patches. Include tests that produce a binary patch (an in-memory `git_patch` object), then enusre that the patch applies correctly.
| * | | zstream: offer inflating, `git_zstream_inflatebuf`Edward Thomson2016-05-264-14/+51
| | | | | | | | | | | | | | | | Introduce `git_zstream_inflatebuf` for simple uses.
| * | | delta: refactor git_delta functions for consistencyEdward Thomson2016-05-264-144/+138
| | | | | | | | | | | | | | | | | | | | Refactor the git_delta functions to have consistent naming and parameters with the rest of the library.
| * | | delta: move delta application to delta.cEdward Thomson2016-05-268-236/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the delta application functions into `delta.c`, next to the similar delta creation functions. Make the `git__delta_apply` functions adhere to other naming and parameter style within the library.
| * | | apply: handle empty patchesEdward Thomson2016-05-262-1/+12
| | | | | | | | | | | | | | | | When a patch is empty, simply copy the source into the destination.
| * | | Patch parsing from patch filesEdward Thomson2016-05-2612-8/+1461
| | | |
| * | | Introduce git_apply_patchEdward Thomson2016-05-268-2/+811
| | | | | | | | | | | | | | | | | | | | The beginnings of patch application from an existing (diff-created) git_patch object: applies the hunks of a git_patch to a buffer.
* | | | Merge pull request #3831 from libgit2/ethomson/readmeEdward Thomson2016-06-251-18/+35
|\ \ \ \ | |_|/ / |/| | | Improve the README
| * | | README: update "Getting Help" sectionEdward Thomson2016-06-201-11/+23
| | | |
| * | | README: update bindingsEdward Thomson2016-06-201-2/+1
| | | | | | | | | | | | | | | | Drop node-gitteh. Replace outdated PowerShell bindings with PSGit.
| * | | README: improve contributing paragraphEdward Thomson2016-06-201-3/+9
| | | |
| * | | README: disambiguate what to distribute source ofEdward Thomson2016-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | Indicate that if you make changes to libgit2 that you must distribute the source _to libgit2_, not the source _of your program_.
* | | | Merge pull request #3834 from pks-t/pks/cleanupsEdward Thomson2016-06-216-99/+6
|\ \ \ \ | | | | | | | | | | Cleanups
| * | | | Remove unused static functionsPatrick Steinhardt2016-06-213-93/+0
| | | | |
| * | | | Avoid old-style function definitionsPatrick Steinhardt2016-06-213-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid declaring old-style functions without any parameters. Functions not accepting any parameters should be declared with `void fn(void)`. See ISO C89 $3.5.4.3.
* | | | | Merge pull request #3833 from pks-t/pks/msys-conditional-fpicEdward Thomson2016-06-211-6/+8
|\ \ \ \ \ | |/ / / / |/| | | | cmake: do not use -fPIC for MSYS2
| * | | | cmake: do not use -fPIC for MSYS2Patrick Steinhardt2016-06-211-6/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MSYS2 build system automatically compiles all code with position-independent code. When we manually add the -fPIC flag to the compiler flags, MSYS2 will loudly complain about PIC being the default and thus not required. Fix the annoyance by stripping -fPIC in MSYS2 enviroments like it is already done for MinGW.
* | | | Merge pull request #3830 from pks-t/pks/thread-namespacingEdward Thomson2016-06-2012-233/+181
|\ \ \ \ | |/ / / |/| | | Thread namespacing
| * | | threads: add platform-independent thread initialization functionPatrick Steinhardt2016-06-204-32/+32
| | | |
| * | | win32: rename pthread.{c,h} to thread.{c,h}Patrick Steinhardt2016-06-205-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old pthread-file did re-implement the pthreads API with exact symbol matching. As the thread-abstraction has now been split up between Unix- and Windows-specific files within the `git_` namespace to avoid symbol-clashes between libgit2 and pthreads, the rewritten wrappers have nothing to do with pthreads anymore. Rename the Windows-specific pthread-files to honor this change.
| * | | threads: remove now-useless typedefsPatrick Steinhardt2016-06-201-7/+0
| | | |
| * | | threads: remove unused function pthread_num_processors_npPatrick Steinhardt2016-06-202-13/+0
| | | | | | | | | | | | | | | | | | | | The function pthread_num_processors_np is currently unused and superseded by the function `git_online_cpus`. Remove the function.
| * | | threads: split up OS-dependent rwlock codePatrick Steinhardt2016-06-204-43/+31
| | | |
| * | | threads: split up OS-dependent thread-condition codePatrick Steinhardt2016-06-204-20/+17
| | | |
| * | | threads: remove unused function pthread_cond_broadcastPatrick Steinhardt2016-06-203-6/+0
| | | |
| * | | threads: split up OS-dependent mutex codePatrick Steinhardt2016-06-204-26/+23
| | | |
| * | | threads: split up OS-dependent thread codePatrick Steinhardt2016-06-208-45/+37
| | | |
* | | | Merge pull request #3818 from meatcoder/fix_odb_read_errorEdward Thomson2016-06-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Fix truncation of SHA in error message for git_odb_read
| * | | | fix error message SHA truncation in git_odb__error_notfound()Sim Domingo2016-06-201-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #3827 from dbrnz/basic_authEdward Thomson2016-06-201-1/+1
|\ \ \ \ | |_|/ / |/| | | HTTP authentication scheme name is case insensitive.
| * | | HTTP authentication scheme name is case insensitive.David Brooks2016-06-191-1/+1
|/ / /
* | | Merge pull request #3823 from libgit2/ethomson/checkout_no_indexCarlos Martín Nieto2016-06-172-1/+69
|\ \ \ | | | | | | | | checkout: use empty baseline when no index file exists
| * | | checkout: use empty baseline when no indexethomson/checkout_no_indexEdward Thomson2016-06-152-1/+69
| | | | | | | | | | | | | | | | | | | | When no index file exists and a baseline is not explicitly provided, use an empty baseline instead of trying to load `HEAD`.
* | | | Merge pull request #3822 from libgit2/ethomson/checkout_head_docsCarlos Martín Nieto2016-06-161-0/+7
|\ \ \ \ | |/ / / |/| | | documentation: improve docs for `checkout_head`
| * | | documentation: improve docs for `checkout_head`ethomson/checkout_head_docsEdward Thomson2016-06-151-0/+7
| | | | | | | | | | | | | | | | | | | | `git_checkout_head` is sadly misunderstood as something that can switch branches. It cannot. Update the documentation to reflect this.
* | | | Merge pull request #3812 from stinb/fetch-tag-update-callbackEdward Thomson2016-06-141-1/+5
|\ \ \ \ | |/ / / |/| | | fetch: Fixed spurious update callback for existing tags.
| * | | fetch: Fixed spurious update callback for existing tags.Jason Haslam2016-06-141-1/+5
| |/ /
* | | Merge pull request #3816 from pks-t/pks/memory-leaksEdward Thomson2016-06-143-9/+23
|\ \ \ | | | | | | | | Memory leak fixes
| * | | winhttp: plug several memory leaksPatrick Steinhardt2016-06-071-2/+16
| | | |
| * | | global: clean up crt only after freeing tls dataPatrick Steinhardt2016-06-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The thread local storage is used to hold some global state that is dynamically allocated and should be freed upon exit. On Windows, we clean up the C run-time right after execution of registered shutdown callbacks and before cleaning up the TLS. When we clean up the CRT, we also cause it to analyze for memory leaks. As we did not free the TLS yet this will lead to false positives. Fix the issue by first freeing the TLS and cleaning up the CRT only afterwards.
| * | | tests: fix memory leaks in checkout::typechangePatrick Steinhardt2016-06-071-2/+2
| |/ /
* | | Merge pull request #3814 from pks-t/pks/invalid-memrefsEdward Thomson2016-06-143-2/+15
|\ \ \ | |/ / |/| | Fix invalid memory references