summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fix-init-orderingfix-init-orderingjoshaber2015-07-2266-379/+1753
|\
| * Merge pull request #3315 from rcorre/docfixCarlos Martín Nieto2015-07-201-1/+9
| |\ | | | | | | Document git_fetch_options struct and fix typo.
| | * Document git_fetch_options struct and fix typo.Ryan Roden-Corrent2015-07-201-1/+9
| |/ | | | | | | | | | | | | | | git_fetch_options was missing from the API docs because it lacked a documentation comment above the struct declaration. I used the git_checkout_options docstring as a template. Also fixes a typo in git_remote_prune_refs (remote, not reamote).
| * Merge pull request #3311 from Fallso/MacroRedefinitionEdward Thomson2015-07-151-0/+2
| |\ | | | | | | Fix macro redefinition warning
| | * Fix macro redefinition warningFallso2015-07-151-0/+2
| | |
| * | Merge pull request #3302 from libgit2/cmn/submodule-foreach-diff-pathCarlos Martín Nieto2015-07-132-1/+19
| |\ \ | | | | | | | | List a submodule only once when the path matches a submodule in the index
| | * | submodule: lookup the submodule by path if availablecmn/submodule-foreach-diff-pathCarlos Martín Nieto2015-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If we get the path from the gitmodules file, look up the submodule we're interested in by path, rather then by name. Otherwise we might get duplicate results.
| | * | submdule: reproduce double-reporting of a submodule in foreachCarlos Martín Nieto2015-07-111-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | When we rename a submodule, we should be merging two sets of information based on whether their path is the same. We currently only deduplicate on equal name, which causes us to double-report.
| * | | Merge pull request #3306 from libgit2/cmn/fetch-ex-fetchCarlos Martín Nieto2015-07-131-74/+27
| |\ \ \ | | | | | | | | | | examples: modernise the fetch example
| | * | | examples: modernise the fetch examplecmn/fetch-ex-fetchCarlos Martín Nieto2015-07-121-74/+27
| | | | | | | | | | | | | | | | | | | | | | | | | Under normal conditions, git_remote_fetch() should be the only function used to perform a fetch. Don't let the example lead people astray.
| * | | | Merge branch 'portable-zu'Carlos Martín Nieto2015-07-1211-20/+20
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix #3094 - improve use of portable size_t/ssize_t format specifiers.Matthew Plough2015-07-1211-20/+20
| | | | | | | | | | | | | | | | | | | | The header src/cc-compat.h defines portable format specifiers PRIuZ, PRIdZ, and PRIxZ. The original report highlighted the need to use these specifiers in examples/network/fetch.c. For this commit, I checked all C source and header files not in deps/ and transitioned to the appropriate format specifier where appropriate.
| * | | | Merge pull request #3292 from tkelman/patch-1Edward Thomson2015-07-112-2/+2
| |\ \ \ \ | | | | | | | | | | | | Increase required version of cmake to 2.8
| | * | | | Increase required version of cmake to 2.8Tony Kelman2015-07-102-2/+2
| | | | | |
| * | | | | Merge pull request #3301 from ethomson/warningsCarlos Martín Nieto2015-07-105-13/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | Clean up some warnings
| | * | | | | khash: add eol so picky compilers stop warningEdward Thomson2015-07-101-1/+1
| | | | | | |
| | * | | | | wildcard filters: move CHANGELOG message to 0.23+1Edward Thomson2015-07-102-6/+5
| | | | | | |
| | * | | | | wildcard filters: clean up some warnings in testsEdward Thomson2015-07-101-5/+9
| | | | | | |
| | * | | | | xdiff: cleanup some warningsEdward Thomson2015-07-102-1/+3
| | | | | | |
| * | | | | | Merge pull request #3297 from tkelman/patch-2Carlos Martín Nieto2015-07-101-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix undefined reference with old versions of openssl
| | * | | | | | Fix undefined reference with old versions of opensslTony Kelman2015-07-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Versions prior to 0.9.8f did not have this function, rhel/centos5 are still on a heavily backported version of 0.9.8e and theoretically supported until March 2017 Without this ifdef, I get the following link failure: ``` CMakeFiles/libgit2_clar.dir/src/openssl_stream.c.o: In function `openssl_connect': openssl_stream.c:(.text+0x45a): undefined reference to `SSL_set_tlsext_host_name' collect2: error: ld returned 1 exit status make[6]: *** [libgit2_clar] Error 1 ```
| * | | | | | | Merge pull request #3272 from ethomson/certCarlos Martín Nieto2015-07-107-34/+32
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | git_cert: child types use proper base type
| | * | | | | | git_cert: child types use proper base typeEdward Thomson2015-07-107-34/+32
| |/ / / / / /
| * | | | | | Merge pull request #3281 from ethomson/wildcard_filtersCarlos Martín Nieto2015-07-097-107/+323
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | filters: custom filters with wildcard attributes
| | * | | | | | filters: custom filters with wildcard attributesEdward Thomson2015-07-017-107/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom filters with wildcard attributes, so that clients can support some random `filter=foo` in a .gitattributes and look up the corresponding smudge/clean commands in the configuration file.
| * | | | | | | Merge pull request #3299 from ethomson/xdiff_updateCarlos Martín Nieto2015-07-0814-86/+188
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't add unnecessary trailing newline during file merge
| | * | | | | | | xdiff: upgrade to core git 2.4.5Edward Thomson2015-07-0712-76/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade xdiff to version used in core git 2.4.5 (0df0541). Corrects an issue where an LF is added at EOF while applying an unrelated change (ba31180), cleans up some unused code (be89977 and e5b0662), and provides an improved callback to avoid leaking internal (to xdiff) structures (467d348). This also adds some additional functionality that we do not yet take advantage of, namely the ability to ignore changes whose lines are all blank (36617af).
| | * | | | | | | revert: correct test that added trailing newlineEdward Thomson2015-07-071-10/+12
| | | | | | | | |
| | * | | | | | | merge_files: don't add trailing newlinesEdward Thomson2015-07-071-0/+39
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When invoked with three files that each lack a trailing newline, the merge result should also lack a trailing newline.
| * | | | | | | Merge pull request #3298 from ethomson/gitauthorsEdward Thomson2015-07-071-0/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | meta: Add Antoine Pelisse to hall-of-fame list
| | * | | | | | meta: Add Antoine Pelisse to hall-of-fame listEdward Thomson2015-07-071-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Antoine Pelisse <apelisse@gmail.com> has kindly allowed his contributions to core git to be used under the libgit2 license.
| * | | | | | Merge pull request #3277 from git-up/git_diff_index_to_indexCarlos Martín Nieto2015-07-073-0/+76
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Added git_diff_index_to_index()
| | * | | | | | Added git_diff_index_to_index()Pierre-Olivier Latour2015-06-303-0/+76
| | | | | | | |
| * | | | | | | Merge pull request #3288 from ethomson/getenvCarlos Martín Nieto2015-07-0713-109/+199
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | git__getenv: utf-8 aware env reader
| * \ \ \ \ \ \ \ Merge pull request #3202 from jeffhostetler/windows_stack_traceCarlos Martín Nieto2015-07-0611-26/+965
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | Stacktraces with CRTDBG memory leaks on Windows
| | * | | | | | | Reserve aux_id 0; sort leaks by aux_id. Fix cmp.Jeff Hostetler2015-06-292-10/+28
| | | | | | | | |
| | * | | | | | | Include stacktrace summary in memory leak output.Jeff Hostetler2015-06-2911-26/+947
| | | | | | | | |
| * | | | | | | | travis: don't install CMake on OS XCarlos Martín Nieto2015-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Homebrew will error out because it's already installed.
| * | | | | | | | travis: update the homebrew dbCarlos Martín Nieto2015-07-061-0/+1
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to make sure we are asking for the current version of packages, or we might get 404s from the download service.
| * | | | | | | Update CHANGELOG with the release numberv0.23.0Carlos Martín Nieto2015-07-061-1/+10
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #3290 from libgit2/cmn/filter-docv0.23.0-rc2Carlos Martín Nieto2015-07-031-2/+35
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | filter: add docs for streaming filters
| | * | | | | | filter: add docs for streaming filterscmn/filter-docCarlos Martín Nieto2015-07-031-2/+35
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | These functions are available on the public API but don't have any documentation, so they don't appear on the API reference. Fix that.
| * | | | | | Merge pull request #3289 from ethomson/warnings4Carlos Martín Nieto2015-07-031-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | iterator_walk: cast away constness for free
| | * | | | | | iterator_walk: cast away constness for freeEdward Thomson2015-07-021-2/+2
| | | | | | | |
| * | | | | | | Merge pull request #3287 from ethomson/filter_test_cleanupCarlos Martín Nieto2015-07-021-6/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | filter::stream: free the filter sanely
| | * | | | | | filter::stream: free the filter sanelyEdward Thomson2015-07-021-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use the filter's free callback to free the actual data structure holding the filter, as we may not always actually initialize it (the test may be skipped).
| * | | | | | | Merge pull request #3286 from libgit2/cmn/submodule-duplicateCarlos Martín Nieto2015-07-022-1/+24
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correctly delimit the keys for submodule lookup
| | * | | | | | | submodule: correctly delimit the keys to use for lookupcmn/submodule-duplicateCarlos Martín Nieto2015-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regex we use to look at the gitmodules file does not correctly delimit the name of submodule which we want to look up and puts '.*' straight after the name, maching on any submodule which has the seeked submodule as a prefix of its name. Add the missing '\.' in the regex so we want a full stop to exist both before and after the submodule name.
| | * | | | | | | submodule: add failing test for loading the wrong submoduleCarlos Martín Nieto2015-07-011-0/+23
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When two submodules are fairly similar, we may end up loading the wrong one.
| * | | | | | | Merge pull request #3280 from linquize/8.3Edward Thomson2015-07-011-1/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix 8.3 filename tests failure when 8.3 is disabled
View Lorry Controller Status