{"push_id":758855280,"size":11,"distinct_size":6,"ref":"refs/heads/jacquesg/update-libgit2","head":"927ae9ea73ba244f2fd28da64c64d721f586c3e5","before":"4c535b982b92c09108aa388f665c8f25c047bbfa","commits":[{"sha":"001eb6d871742b6f41cb296e57d69d9a6e041db6","author":{"email":"f3ffc7264a97a0f843921c35b864bcd6ac1a0f3f@striata.com","name":"Jacques Germishuys"},"message":"travis.yml: Extra ccache","distinct":false,"url":"https://api.github.com/repos/jacquesg/p5-Git-Raw/commits/001eb6d871742b6f41cb296e57d69d9a6e041db6"},{"sha":"5f26758c6977ccd621b532e234b746cb16493d97","author":{"email":"f3ffc7264a97a0f843921c35b864bcd6ac1a0f3f@striata.com","name":"Jacques Germishuys"},"message":"t/15-merge.t: use 'merge' conflict style\n\nFixes #163","distinct":false,"url":"https://api.github.com/repos/jacquesg/p5-Git-Raw/commits/5f26758c6977ccd621b532e234b746cb16493d97"},{"sha":"94b31a5eeab82da263a93239dfd9a950333d6333","author":{"email":"f3ffc7264a97a0f843921c35b864bcd6ac1a0f3f@striata.com","name":"Jacques Germishuys"},"message":"Raw.xs: Include __FILE__ and __LINE__ when git_to_sv_ptr() croaks","distinct":false,"url":"https://api.github.com/repos/jacquesg/p5-Git-Raw/commits/94b31a5eeab82da263a93239dfd9a950333d6333"},{"sha":"1cd2c445072368f7f1b5ac56ba13f9ded5b6338e","author":{"email":"f3ffc7264a97a0f843921c35b864bcd6ac1a0f3f@striata.com","name":"Jacques Germishuys"},"message":"Raw.xs: Include __FILE__ and __LINE__ when an unknown (unexplained) error occurs","distinct":false,"url":"https://api.github.com/repos/jacquesg/p5-Git-Raw/commits/1cd2c445072368f7f1b5ac56ba13f9ded5b6338e"},{"sha":"22602617d62b4a849d1b4ea2313c3a9cba3d2a96","author":{"email":"f3ffc7264a97a0f843921c35b864bcd6ac1a0f3f@striata.com","name":"Jacques Germishuys"},"message":"Raw.xs: cleanup assert/croak_assert usage","distinct":false,"url":"https://api.github.com/repos/jacquesg/p5-Git-Raw/commits/22602617d62b4a849d1b4ea2313c3a9cba3d2a96"},{"sha":"7c9f4c01c4f6e767d2a74ed8b9dcd1432d54dce0","author":{"email":"f3ffc7264a97a0f843921c35b864bcd6ac1a0f3f@striata.com","name":"Jacques Germishuys"},"message":"Squashed 'deps/libgit2/' changes from 623fbd9..9f1af7f\n\n9f1af7f Merge pull request #3168 from libgit2/cmn/config-tx\n1573acb Merge pull request #3372 from libgit2/cmn/mirror-refspec\n5340d63 config: perform unlocking via git_transaction\n36f784b config: expose locking via the main API\nb166703 config: implement basic transactional support\n3ce9e4d config: write the modified file to memory\nbbbd0cb Merge pull request #3363 from ripdev/master\ne3e017d remote: don't confuse tag auto-follow rules with refspec matching\na879276 remote: add failing test for a mirror refspec\nc27b4af Forcing libssh2 lib location\n98f7bd2 Merge pull request #3360 from nodegit/master-duplicate-basename-fix\neba784d Fix duplicate basenames to support older VS\ncf716be Merge pull request #3351 from ethomson/error_buf\nef4857c errors: tighten up git_error_state OOMs a bit more\n854b701 Merge remote-tracking branches 'upstream/pr/3323' and 'upstream/pr/3329'\n988ea59 Test: check restored oom error points to static buffer\n0fcfb60 Make giterr_restore aware of g_git_oom_error\n25dbcf3 Make giterr_detach no longer public\nc2f17bd Ensure static oom error message not detached\n5ef4b86 Add failing test for capture/restore oom error\n69adb78 Merge pull request #3325 from libgit2/cmn/filebuf-rename-error\n0dd8dae Merge pull request #3344 from libgit2/cmn/add-unreg-submodule\n3cf4eb0 Merge pull request #3348 from MrHacky/remote-path-with-tilde\nac728c2 Handle ssh:// and git:// urls containing a '~' character.\nea961ab index: stage an unregistered submodule as well\nb426ac9 index: test that an unregistered submodule gets staged\n63e5b55 index: add test for adding an old-style submodule to index\nc400bac Merge pull request #3332 from phatblat/ben/doc-warnings\n723babd Merge pull request #3341 from stewid/pedantic-compiler-warning\nc369b37 Remove extra semicolon outside of a function\n9d4b7d2 Merge pull request #3328 from libgit2/cmn/iterator-skip-diriter\na8058ff Merge pull request #3339 from palmin/palmin-issue-3338\n31a7637 case-insensitive check for WWW-Authenticate header\n6d8f3a5 Better param docs\nf85fc36 error: store the error messages in a reusable buffer\n08afd22 Fix remaining documentation warnings\n2da64ed Add -Wdocumentation flag if supported\nf90fbb8 Use correct Doxygen trailing comment syntax\n41808d0 Fix @param names in doc comments\n0e391d8 iterator: adjust unreadable-dir test to new behaviour\n12786e0 iterator: skip over errors in diriter init\n19d9beb filebuf: remove lockfile upon rename errors\n668053b filebuf: failing test for leaving the lockfile when failing to rename\n2dfd5ea Merge pull request #3307 from libgit2/cmn/submodule-backslash\n759b223 Merge pull request #3303 from libgit2/cmn/index-add-submodule\n91dad18 Merge pull request #3305 from libgit2/cmn/reflog-del-backend\n14e805a Merge pull request #3304 from libgit2/cmn/checkout-free-stream\n4e0421f Merge pull request #3317 from csware/fix-vista\nabbe17e Merge pull request #3322 from libgit2/fix-init-ordering\n9830fbb Merge branch 'master' into fix-init-ordering\ncf198fd Increment `git__n_inits` before doing `init_once`.\n318bb76 Make libgit2 work on Windows Vista again\n42156d5 Merge pull request #3315 from rcorre/docfix\n37996d4 Document git_fetch_options struct and fix typo.\n274f0b9 Merge pull request #3311 from Fallso/MacroRedefinition\ncec3569 Fix macro redefinition warning\nceb5873 Merge pull request #3302 from libgit2/cmn/submodule-foreach-diff-path\na58854a submodule, path: extract slash conversion\n97c0a85 Merge pull request #3306 from libgit2/cmn/fetch-ex-fetch\nf00f005 submodule: normalize slashes in resolve_url\naa51fa1 submodule: add failing test for backslash in url\nf861aba Merge branch 'portable-zu'\n768f8be Fix #3094 - improve use of portable size_t/ssize_t format specifiers.\n6c7e86e examples: modernise the fetch example\n01d0c02 refdb: delete a ref's reflog upon deletion\n4de7f3b filter: make sure to close the stream even on error\n247d27c index: allow add_bypath to update submodules\n0d98af0 blob: fail to create a blob from a dir with EDIRECTORY\n8a52ed7 errors: add EDIRECTORY\na522d8c Merge pull request #3292 from tkelman/patch-1\n08c2d3e submodule: lookup the submodule by path if available\na34c4f8 submdule: reproduce double-reporting of a submodule in foreach\n37c84dc Increase required version of cmake to 2.8\n1cd9601 Merge pull request #3301 from ethomson/warnings\na1687f7 Merge pull request #3297 from tkelman/patch-2\nf2a328f Merge pull request #3272 from ethomson/cert\n9c03310 khash: add eol so picky compilers stop warning\n9a99ca7 wildcard filters: move CHANGELOG message to 0.23+1\nbae467a wildcard filters: clean up some warnings in tests\na3c00cd xdiff: cleanup some warnings\n7969803 git_cert: child types use proper base type\n9847d80 Merge pull request #3281 from ethomson/wildcard_filters\ncd85ce6 Merge pull request #3299 from ethomson/xdiff_update\n234ca40 xdiff: upgrade to core git 2.4.5\n43ce8cb revert: correct test that added trailing newline\nae8f726 merge_files: don't add trailing newlines\n286befe Merge pull request #3298 from ethomson/gitauthors\n01e031d meta: Add Antoine Pelisse to hall-of-fame list\nfebc8c4 Fix undefined reference with old versions of openssl\n3704ac3 Merge pull request #3277 from git-up/git_diff_index_to_index\nea445e0 Merge pull request #3288 from ethomson/getenv\n3c83111 Merge pull request #3202 from jeffhostetler/windows_stack_trace\na0bdfe3 travis: don't install CMake on OS X\nd41b8ed travis: update the homebrew db\n159061a Update CHANGELOG with the release number\n4d6362b Merge pull request #3290 from libgit2/cmn/filter-doc\na94d3e6 filter: add docs for streaming filters\n99090a8 Merge pull request #3289 from ethomson/warnings4\ne069c62 git__getenv: utf-8 aware env reader\nf034c85 Merge pull request #3287 from ethomson/filter_test_cleanup\ndd6b24b iterator_walk: cast away constness for free\n79306d8 filter::stream: free the filter sanely\neb94199 Merge pull request #3286 from libgit2/cmn/submodule-duplicate\ne0af3cb submodule: correctly delimit the keys to use for lookup\ne8e848a submodule: add failing test for loading the wrong submodule\nbf7d276 Merge pull request #3280 from linquize/8.3\n3406596 submodule: completely remove reload_all\n6392443 filters: custom filters with wildcard attributes\n526f91f Fix 8.3 filename tests failure when 8.3 is disabled\naa92c31 Merge pull request #3278 from mplough/master\n9126cca Fix #3093 - remove declaration of unused function git_fetch__download_pack\n2f60073 Merge pull request #3273 from ethomson/warnings3\ncb58fb2 Merge pull request #3275 from git-up/http_fix\nccef5ad Added git_diff_index_to_index()\n1630981 http: fixed leak when asking for credentials again\neb29292 index tests: add eol to avoid compiler warning\n504b069 checkout test: mark unused vars\n0305721 winhttp: remove unused var\n69c8bf7 posix compat: include sys/stat.h for mingw\n4984005 diff: use size_t format\n3451c87 Merge pull request #3271 from jeffhostetler/more_leaks\n64e6b5b fix memory leak in refspec.c on errors.\n7bfdd1c Merge pull request #3270 from ethomson/warnings2\n64c415c checkout test: check getcwd return value\neadf371 clar: test chdir\nd88abb8 filter test: pass base type\nd202bb7 examples: clean up some warnings\ne5f9df7 odb: cast to long long for printf\n6065505 submodule: cast enum to int for compare\n3ca84ac openssl: free hostname\n0175971 stash: const up conflict params\n2cf33fe index test: include repository.h for decl\n149d5d8 stash: drop unused variable\nded4cca iterator_walk: drop unused variable\n827b954 Reserve aux_id 0; sort leaks by aux_id. Fix cmp.\n93b4272 Include stacktrace summary in memory leak output.\n4a0313b Merge pull request #3269 from libgit2/cmn/release-fixups\n8b38006 http: don't give up on auth on the first try\nc28a5c9 submodule: remove trailing slashes from submodule paths\ncf4030b submodule: remove some obsolete logic\nca2466f CHANGELOG: add submodule changes\nb977d01 Merge pull request #3268 from libgit2/vmg/pkg-config-sort\n6a5fb1f pkg-config: Sort the different sections\n84d5a98 Bump version to 0.23.0 and SOVERSION to 23\nfb84cde Merge pull request #3267 from libgit2/cmn/libs-list\nfd2d11a CMake: treat the ld flags as a list\nfa39975 Merge pull request #3265 from libgit2/leaks\n92ec9ed Merge pull request #3260 from ethomson/apply_with_reflog_indices\nb4d2c7c Merge pull request #3264 from arthurschreiber/fast-builds\n32f538a Remove dependency installation file for travis builds.\nb48dfe0 Always install valgrind via the apt addon.\n24fa21f index, iterator, fetchhead: plug leaks\nafd8a94 checkout: plug a few leaks\n9568660 diff: fix leaks in diff printing\ncfafeb8 Merge pull request #3263 from git-up/fixes\n51f8799 Don't try to start ssh.\n76d7c35 Fast builds?\nee6eed5 stash: test we apply using reflog-like indices\n354268c Merge pull request #3259 from ethomson/stash_apply_argh\n3c7a469 Merge pull request #3262 from libgit2/vmg/prefix-len\n492851c Removed unused variables\ncae2a55 Fixed build failure if GIT_CURL is not defined\n13e5e34 test-diff-blob: Pass proper nibble sizes\na2f8d1a revparse: Add test to make sure this doesn't regress\n3d9ef2d Revert \"object: correct the expected ID size in prefix lookup\"\n1488807 Merge pull request #3261 from libgit2/cmn/link-one-level\n790cabf pc: Put libcurl and libssh2 in Libs.private\n3418182 Merge pull request #3234 from ethomson/dont_update_index_unnecessarily\nc2e1b05 Only write index if updated when passing GIT_DIFF_UPDATE_INDEX\n619423f diff: test we don't update index unnecessarily\nc0280bd Merge pull request #3255 from libgit2/cmn/rename-unspecified\n552249f Merge pull request #3258 from arthurschreiber/patch-6\nb7f5cb8 stash: stage new files when unstashing them\n8960dc1 iterator: provide git_iterator_walk\n82b1c93 stash: don't allow apply with staged changes\n1db6a0a stash apply: add a newly staged file to tests\n65f2d15 List `libcurl` in the generated `libgit2.pc`\n3b66c6a Merge pull request #3256 from libgit2/cmn/fetch-spec-fetchhead\n87987fd Merge pull request #3246 from libgit2/cmn/dont-grow-borrowed\n23aa7c9 remote: insert refspecs with no rhs in FETCH_HEAD\nc2418f4 Rename FALLBACK to UNSPECIFIED\n3cf91d9 Add CHANGELOG entries\na659923 buffer: make use of EINVALID for growing a borrowed buffer\n189aad4 errors: introduce EINVALID\nbd470d0 blob: don't recomment using git_buf_grow\ncaab22c buffer: don't allow growing borrowed buffers\ndaacf96 Merge pull request #3097 from libgit2/cmn/submodule-config-state\ne1f434f Merge pull request #3183 from libgit2/cmn/curl-stream\n9d5efab Merge pull request #3254 from ethomson/diff-binary-patch\nc2f274c Merge pull request #3250 from ethomson/stash\n5407709 diff: determine DIFFABLE-ness for binaries\nba8fb7c diff::binary tests: empty diff when forced binary\n58ca8c7 SecureTransport: use the curl stream if available\n8443f49 curl: remove the encrypted param to the constructor\nf97d5d0 http: ask for the curl stream for non-encrypted connections\ne247649 openssl: use the curl stream if available\ncdee630 curl: extract certificate information\n8762d72 http: set the proxy if the stream supports it\n1376e78 stream: add support for setting a proxy\nede517b curl: add CHANGELOG and THREADING entries\n8dea1c2 Implement a curl stream\ncf9d5f7 curl: find and link with the library if it's available by default\n7663321 binary diff: test that the diff and patch otputs are the same\naacfd03 Merge pull request #3251 from git-up/fixes\n6a8f3fa Fixed invalid error handling in git_repository_open_ext()\n8113056 Fixed Xcode 6.1 build warnings\ncc605e7 Merge pull request #3222 from git-up/conflicted\n09f3364 Merge pull request #3131 from urkud/const-char\nbd670ab Merge pull request #3226 from libgit2/cmn/racy-diff-again\n8351abc Merge pull request #3249 from libgit2/cmn/repo-version-check\n9017711 stash: save the workdir file when deleted in index\n14304b0 stash tests: ensure we save the workdir file\n5ef43d4 git_diff__merge: allow pluggable diff merges\n83ba5e3 diff_tform: remove reversed copy of delta merger\n16c73d3 repository: check the format version\n99e11cd repository: don't error out if there is no version\n8d8a2ee Fixed GIT_DELTA_CONFLICTED not returned in some cases\n0c34fa5 Merge pull request #3228 from git-up/diff_merge\ncb63e7e Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()\n91c1833 Merge pull request #3199 from ethomson/crlf\n146d0d0 crlf: give Unix the glory of autocrlf=true\n1e46d54 crlf tests: ensure that Unix obeys autocrlf=true\n8293c8f git_buf_text_lf_to_crlf: allow mixed line endings\n47e9a6c crlf: use statistics to control to workdir filter\n71686dd clar: support hierarchical test resource data\ne774fa6 crlf tests: posix known-good data\n4ebe320 crlf tests: windows known-good data\n3d92b9a crlf tests: use known-good data produced by git\nbf8c0a9 crlf: script to generate expected crlf data\nbd5e59e crlf: include utf8 resources in master branch\n84f8f50 crlf: include additional test resources\n0b6ed4f Merge pull request #3240 from libgit2/cmn/commit-header-field\n783672f submodule: remove the RESET enum values\n0496330 submodule: test unsetting config options\nc4e3a3d submodule: handle writing out all enum values for settings\n15c3810 config: provide a function to reverse-lookup mapped cvars\n7d6dacd examples: adjust to submodule status API change\n4536574 submodule: test more accurately for non-existence\nadb58f7 submodule: fix potential leak in the tests\n961861f submodule: get rid of `_save()`\nd6073b3 submodule: make `_set_url()` affect the configuration\n486ba4c submodule: make `_set_branch()` affect the configuration\n4e63642 submodule: make `_set_update_fetch_recurse_submodules()` affect the config\ne8a39f8 submodule: make `_set_update()` affect the configuration\n2278637 submodule: correct detection of existing submodules\nd769a3f submodule: bring back finding by path\nc6f489c submodule: add an ignore option to status\n64bbd47 submodule: don't let status change an existing instance\n5a9fc6c submodule: make set_ignore() affect the configuration\ndfda2f6 submodule: remove the per-repo cache\n0c94deb Merge pull request #3239 from git-up/stash_index\nbb4896f Add a note about racy-git in CHANGELOG\n6e611f7 index: add a diff test for smudging a file which becomes empty\n27133ca tests: move racy tests to the index\n5b05f95 merge: work around write-side racy protection when hacking the index\na3f42fe commit: allow retrieving an arbitrary header field\n26432a9 tests: set racy times manually\n6c5eaea tests: plug leaks in the racy test\n7497584 index: check racily clean entries more thoroughly\nff47537 diff: check files with the same or newer timestamps\ne35b947 Write modified index in git_stash_apply()\ne96a97f Merge pull request #3233 from ethomson/status_typechange\n96dd171 diff: preserve original mode in the index\nfc65680 status: test that symlinks don't lose their mode\n9018529 Merge pull request #3238 from git-up/double_free\n883cb64 Merge pull request #3236 from libgit2/cmn/index-checksum\n07ea3a7 Fixed index being double-freed in stash tests\n624c949 index: make relative comparison use the checksum as well\n3e5b553 Merge pull request #3232 from Therzok/patch-2\n863dd89 tests: tick over five seconds instead of one\n5e947c9 index: use the checksum to check whether it's been modified\n46c84c7 index: user a better assertion when comparing sizes\ne488bef Quote LIBSSH2_LIBRARIES call\n6e0470e Merge pull request #3229 from git-up/build_warnings\n85a5e8e Fixed Xcode 6.1 build warnings\n83a04a6 Merge pull request #3227 from jeffhostetler/memory_leak__tests_network_refspecs\n534d136 Fix memory leak in tests/network/refspecs.c\na56db99 Merge pull request #3219 from libgit2/cmn/racy-diff\n892abf9 checkout: allow workdir to contain checkout target\nfef5344 merge::workdir::dirty: tick idx to defeat racy-git\n121c317 Introduce p_utimes and p_futimes\n5f83758 Merge pull request #3209 from libgit2/cmn/double-author\n86faea5 Merge pull request #3225 from libgit2/cmn/url-empty\n47a40d1 remote: return EINVALIDSPEC when given an empty URL\naeb2b99 Merge pull request #3221 from git-up/build_warnings\ne44abe1 tests: tick the index when we count OID calculations\nc4e6ab5 crlf: tick the index forward to work around racy-git behaviour\n316b820 index: zero the size of racily-clean entries\n77596fc diff: add failing test for racy-git in the index\nb93dcd4 Merge pull request #3216 from dprofeta/fixTransactionVisibility\n0f4d9c0 Fixed Xcode 6.1 build warnings\nf621f08 Merge pull request #3220 from libgit2/cmn/readdir\n25bd0aa path: remove unnecessary readdir_r usage\n2665fef Merge pull request #3171 from libgit2/cmn/link-fallback\nb224c38 Fix in stransport_stream.c for usage of SecCopyErrorMessageString(), which is unavailable to iOS targets.\nd4723c8 Merge pull request #3177 from ethomson/binary_diff\nae22ef0 Merge pull request #3217 from jeffhostetler/leak_checkout_icase\nf2dec48 Merge pull request #3215 from jeffhostetler/windows_leak_diriter\n26d5c0b Fix leaks in tests/checkout/icase\n5c75732 Fix visibility of transaction symbol\n95639db Fix memory leak on windows in diriter.\n0e522f6 binary diff: document changes in CHANGELOG\n3208df3 patch: include diff options on blob->blob diffs\n391281a binary diff: test binary blob to blob tests\n8147b1a diff: introduce binary diff callbacks\nac7012a binary diff: test index->workdir binary diffs\n6995b18 Merge pull request #3208 from git-up/secure_transport\n4ce5824 Merge pull request #3214 from libgit2/cmn/push-tests\n352ee17 clone: set the credentials callback during testing\n0f69b41 push: pass the callbacks during setup as well\n6042a05 travis: fail if we fail the push tests\n6d0a0ac Fixed some Secure Transport issues on OS X\n2deb360 Merge pull request #3155 from mgorny/userpass-const\n65d69fe commit: ignore multiple author fields\nfa934fa Merge pull request #3205 from ethomson/crlf_query\n3fcfede Merge pull request #3207 from ethomson/winhttp_eol\n3e8c5e4 Merge pull request #3174 from libgit2/cmn/idx-fill-hole\n7f8cd67 Merge pull request #3204 from git-up/git_diff_find_similar\n4f0f2b8 Correct line endings on winhttp.def\n2eecc28 Introduce `git_filter_list_contains`\n4e883b5 Merge pull request #3203 from ethomson/gitattributes\n5045680 Fixed handling of GIT_DELTA_CONFLICTED  in git_diff_find_similar()\nf284e72 gitattributes: let clients use native line endings\nda6720f Merge pull request #3201 from libgit2/cmn/coverity\n0137aba filter: close the descriptor in case of error\n969d4b7 object: correct the expected ID size in prefix lookup\n878293f pack: use git_buf when building the index name\nca2857d merge: actually increment the counts, not the pointers\n2d73075 cache: add a check for a failed allocation\na166466 Merge pull request #3198 from libgit2/cmn/coverity\n02980bd Initialize a few variables\n81be2f4 ssh: move NULL check to the free function\n82a7a24 Merge pull request #3165 from ethomson/downcase\nc0d7999 Merge pull request #3188 from thentenaar/clean-up-after-openssl\n20f8edb global: Ensure we free our SSL context.\nb6011e2 Merge pull request #3185 from libgit2/cmn/foreach-cancel-loose\nfdb82dc Merge pull request #3175 from git-up/build_warnings\n2785544 remote: some error-handling issues from Coverity\n3c4442a Merge pull request #3179 from arielb2/master\n8da4404 path: error out if the callback returns an error\nbabdc37 Merge pull request #3172 from Therzok/patch-2\n9334c86 print_usage functions is defined but not used\n9f3c18e Fixed build warnings on Xcode 6.1\nd71e3b2 Change error when running out of ssh agent keys\naa57231 indexer: use lseek to extend the packfile\n1094073 clone: fall back to copying when linking does not work\nbe5fda7 Include git2/transaction.h\n449f9ec Merge pull request #3152 from tkelman/patch-1\nac587e7 Merge pull request #3048 from pks-t/insteadof\n9e88a82 remote: test insteadOf for anonymous remotes\n771069e Add CHANGELOG entry for url.*.insteadOf feature.\nec0c4c4 remote: apply insteadOf configuration.\nbad33a5 git__tolower: test that some non-ASCII downcasing isn't\n75a4636 git__tolower: a tolower() that isn't dumb\n006548d git__strcasecmp: treat input bytes as unsigned\na5670d4 CHANGELOG: fill in a few missing entries\n2c8550f Merge pull request #3157 from mgorny/ssh_memory_auth\n64be170 Merge pull request #3163 from ethomson/emergeconflict\n885b94a Rename GIT_EMERGECONFLICT to GIT_ECONFLICT\n41a71c1 Merge pull request #3161 from fxfactorial/master\n69560cc Changed README to use new OCaml bindings to git\nff8d635 Merge pull request #3139 from ethomson/diff_conflicts\nfb92b48 Merge pull request #3149 from libgit2/cmn/upstream-matching-push\n2b92283 Merge pull request #3127 from libgit2/cmn/remote-fixups\n9b3e41f index_add_all: remove conflicts when no wd file\n10549a2 Introduce `GIT_DIFF_FLAG_EXISTS`\n666ae18 git_index_add_all: test that conflicts are handled\n1c4b5ce Introduce cl_git_sandbox_init_new()\n253a05f diff: prettify `maybe_modified` a little\n9f545b9 introduce `git_index_entry_is_conflict`\n2f1080e conflict tests: use GIT_IDXENTRY_STAGE_SET\n191e97a diff conflicts: don't include incorrect ID\nb22369e diff conflicts: test index to workdir w/ conflicts\nbb81515 diff conflicts: add tests for tree to index\n7877146 diff: for conflicts w/o workdir, blank nitem side\n7c94801 diff/status: introduce conflicts\nd67f270 index: validate mode of new conflicts\n3ab5a65 index: remove error message in non-error remove\necd60a5 conflicts: when adding conflicts, remove staged\n1b6c26d diff: wrap the iterator functions\naa3af01 index iterator: optionally include conflicts\n9566ce4 remote: call the update_tips callback for opportunisitc updates\nc6e942f remote: validate refspecs before adding to config\nae5b936 remote: remove fetch parameter from create_anonymous\nc7f9412 Merge pull request #3160 from b4n/ident-same-as-git\n8085adf test: Add a test for in-memory SSH private key cred_cb\n2629fc8 cred: Check for null values when getting key from memory\nf7142b5 cred: Declare GIT_CREDTYPE_SSH_MEMORY unconditionally\n1679ec1 cmake: Add CMake check for libssh2 memory credential passing support\n08e6b87 Return an error when ssh memory credentials are not supported.\n7a8b850 Add support to read ssh keys from memory.\n1ecbcd8 Fix ident replacement to match Git behavior\n462865d cred_helpers: Add 'const' qualifiers to git_cred_userpass_payload\n2a30677 build maint branches on appveyor\nc11daac Merge pull request #3151 from ethomson/thinpack\ne2dd373 indexer: avoid loading already existent bases\n38c10ec indexer: don't look for the index we're creating\n2540487 Merge pull request #3108 from libgit2/cmn/ssl-no-want\nca183d2 travis: build maint branches\n5014fe9 branch: error out if we cannot find the remote\n7cd4ba1 refspec: make sure matching refspecs have src, dst and input strings\na6ea108 Merge branch 'sni'\n987045c Call the openssl API to be able to work with SNI servers.\n5d74fb7 Merge pull request #3145 from stinb/fix_cxx_build\n6675aab Merge pull request #3146 from ethomson/add_untracked_files\ncbfeecf git_index_add_all: don't recurse ignored dirs\n3e85be2 Merge pull request #3144 from libgit2/cmn/ignored-ignore\nfa9a969 index_add_all: include untracked files in new subdirs\nd30155f Fix error when building as C++.\n2c57114 ignore: clear the error when matching a pattern negation\ncd3f3c2 Add a missing include for reset\nc06e180 Merge pull request #3137 from libgit2/cmn/server-errors\n1396c38 errors: add GIT_EEOF to indicate early EOF\ne343567 ssh: read from stderr if stdout is empty\nacc573c Merge pull request #3109 from libgit2/cmn/index-use-diff\n0aa6033 Merge pull request #3132 from libgit2/cmn/path-direach-cberror\nedef91e fileops: set an error on write error for file copy\n70f7484 remote: get rid of the run-time refspec setters\n7b5ce2e clone: don't rely on auto-saving for single-branch\n9663d1b Fix typos in the CHANGELOG\n5473836 fileops: set an error message if we fail to link a file\n8a4d77f path: don't let direach overwrite the callback's error message\n9042693 Merge pull request #3130 from mortonfox/patch-1\nc8022e6 Add `const` qualifier\n481ac3d Merge pull request #3129 from Therzok/patch-2\ne702dc2 Updated dlibgit link.\n7e9a240 Make \"Early EOF\" message start with lowercase\n542a7de local: plug a leak in the progress reporting\n874cc35 index: add a CHANGELOG entry for the diff usage\n2b2dfe8 index: include TYPECHANGE in the diff\n0a78a52 index: make add_all to act on a diff\n197307f index: refactor diff-based update_all to match other applies\n713e11e index: use a diff to perform update_all\n4a6a674 Merge pull request #3128 from libgit2/cmn/push-notify-deleted\n254ff3e push: fix the update constructor\n041ad7d push: add tests for the push negotiation callback\n98270f5 Add CHANGELOG entry for index entry changes\n16d742e Merge pull request #3119 from ethomson/ignore\ncd430bc Merge pull request #3103 from libgit2/cmn/local-push-message\n2ec73fa Merge pull request #3102 from libgit2/cmn/pack-objects-report\na6f2cea Merge pull request #3118 from libgit2/cmn/stream-size\n882cc37 attr tests: make explicit our dir/file match tests\n3e529e9 Fix a few leaks\n3c337a5 packbuilder: report progress during deltification\n8cec2b8 local: send the packbuilder progress via the sideband\ncf66c47 examples: show the sideband progress on clone\nd01737b Merge pull request #3117 from libgit2/cmn/index-more-accurate\nb0c4b64 Merge pull request #3116 from libgit2/cmn/remove-ssh-embed\n6cd9219 Merge pull request #3115 from libgit2/cmn/clone-submodule\na3ff28e Merge pull request #3120 from libgit2/cmn/backends-prio\n0bc3d56 tests: don't push to our resources\n4a5b781 local: use the packbuilder to push\n81c0fb0 local: add clarification for non-bare push restriction\nc5c5cdb Merge pull request #3066 from libgit2/cmn/remote-less-state\nb0d7f32 odb: reverse the default backend priorities\n3251972 push: free the update list\nb1ae3e5 Update CHANGELOG with the changes to the remotes\n3e20154 remote: simplify anonymous creation\na4b6452 remote: remove git_remote_save()\n7725499 remote: remove live changing of refspecs\n3fec548 examples: adjust to the new remote API\n35a8a8c remote: move the tagopt setting to the fetch options\n3eff2a5 remote: move the update_fetchhead setting to the options\n058b753 remote: move the transport ctor to the callbacks\n6fb373a remote: add prune option to fetch\n2226134 remote: remove url and pushurl from the save logic\n8f0104e Remove the callbacks struct from the remote\n0525911 push: remove own copy of callbacks\n77b339f odb: make the writestream's size a git_off_t\n34593aa attr: declare variable at top of block for msvc\n90997e4 attr: less path mangling during attribute matching\n9465bed attr: don't mangle file path during attr matching\n30e629a attr: always return errors\nef6d072 attr: don't match files for folders\n9486d20 attr test: test a file beneath ignored folder\n97fb9ac attr: test that a file is not ignored for a folder\nadad518 attr: regression tests for ignore matching\nca29427 index: make the entries have more accurate sizes\n20dcb73 Get rid of libssh2 embedding\nf85a9c2 Merge pull request #3111 from whoisj/centralizing-buffer-sizes\n1e44ea9 submodule: add test initialising and cloning a repo\n77a15fe Merge pull request #3018 from ethomson/stash_apply\n1f1f5c6 checkout: better document the `baseline_index` opt\n15fdf05 stash application: document new API in CHANGELOG\n4497287 stash: propagate the error when writing a tree\n4ea3eeb stash_apply: provide progress callbacks\n19c80a6 stash_apply: provide its own options structure\n2496166 stash: test checkout notify callbacks\n12149a2 stash apply: default to at least GIT_CHECKOUT_SAFE\nf78bb2a stash: return GIT_EMERGECONFLICT on merge conflict\n958950b stash: document merge conflicts\nf095758 stash: refactor to use merge_iterators\n90f8408 stash: ensure a reflog has entries\nd0dd3fc stash apply: check out a tree, not piecewise\n7f26b1b stash: use git_commit_summary for a summary\n35d3976 index: introduce git_index_read_index\n73dce1f checkout: allow baseline to be specified as index\n9ebb5a3 merge: merge iterators\nbf8dd3f Added git_stash_apply() and git_stash_pop() APIs\n7dd2253 centralizing all IO buffer size values\n77bffc2 openssl: don't try to handle WANT_READ or WANT_WRITE\n9cdd657 Merge pull request #3104 from whoisj/optimal-buffer-size\n7eb7e03 Adjusting stream buffer size to 64KB\n25f355c Merge pull request #3086 from yongthecoder/master\n5b6292a Merge pull request #3100 from arthurschreiber/patch-5\n7a5c755 Ensure frameworks are mentioned in libgit2.pc\nb162d97 config: plug a couple of leaks\n57aa839 Android build doesn't need deps/regex\n074d323 Merge pull request #3079 from ethomson/config\nc3414d5 Merge pull request #3070 from ethomson/checkout_icase\nd6b7e40 config: test all multivars are updated\n0daf998 config: use wildcard in test instead of empty expr\n63c0cc6 config: cleanup some now-unused variables\n9c26de0 config: lock the file for write before reading\n5a70df9 Test setting config var under duplicate header.\n2a950c9 config: write existing lines as-is when rewriting\nbf99390 config: examine whole file when writing\nf79c732 config: test overwriting cvar in multiple regions\n7ee61b8 config: ensure we can write to an empty file\ncd79d99 checkout test: better case-insensitive test on Mac\nf286e27 status test: always test the new file path\n64842d8 checkout test: only run icase on icase platform\n4beab1f checkout: break case-changes into delete/add\n05f6901 checkout: remove blocking dir when FORCEd\n3520c97 Revert \"Always checkout with case sensitive iterator\"\n6dfd850 checkout test: ensure we write to casechanged dir\n431f980 checkout test: ignore unstaged case-changing renames\ncfc2e56 Merge pull request #3087 from ethomson/pr/3054\n72f8da9 Merge pull request #3089 from volftomas/patch-2\n785990b Restructured to be nicer example\nef23a82 Merge pull request #3092 from techee/iconv_macports_fix2\nb7df2e8 Don't search iconv in /opt/local\nbe3f104 diriter: actually use iconv on mac\ncd39e4e git_buf_put_w: introduce utf16->utf8 conversion\nf63a1b7 git_path_diriter: use FindFirstFile in win32\n5c387b6 git_path_diriter: next shouldn't take path ptr\n7ef005f git_path_dirload_with_stat: moved to fs_iterator\nba8ef18 git_path_dirload_with_stat: use git_path_diriter\n35c1d20 git_win32_path_dirload_with_stat: removed\n07bbc04 git_path_dirload: use git_path_diriter\nedbfc52 git_path: introduce 'git_path_diriter'\ncbe8a61 Merge pull request #3059 from libgit2/cmn/negotiation-notify\n9f73e1f Merge pull request #3081 from leoyanggit/build_warnings\n5e00e5c Merge pull request #3090 from libgit2/jamill/doc_update\n1275de5 Merge pull request #3088 from volftomas/patch-1\nbf2ba52 Update documentation for API changes\n9bff15f Added call to git_libgit2_shutdown()\ncf2380a Fixed unused warning in tests/rebase/merge.c\n891cc50 Merge pull request #3085 from yongthecoder/regfree\ne30438c Do not call regfree() on an empty regex that is not successfully created by regcomp\n544139f win32: keep full path for realpath usage\nc074d7a win32: mimic git_path_dirload_with_stat closely\nb3f6cef dirload: loop conditional; less path mangling\ne05531d win32 dirload: don't heap allocate DIR structure\nf3c444b win32: abstract file attributes -> struct stat fn\n1920ee4 Improvements to status performance on Windows.\n4c09e19 Improvements to ignore performance on Windows.\n69f0032 Fix some build warnings\nd969d41 Merge pull request #3071 from linquize/git_reflog_drop\n31d5dce Fix wrong format string in git_reflog_drop() error message\n6580840 Merge pull request #3063 from ethomson/config_validate_name\ndbb4595 Merge pull request #2997 from libgit2/cmn/secure-transport\n44b769e SecureTransport: handle graceful closes\n65ac7dd SecureTransport: require TLS v1.x\n85247df Update THREADING and CHANGELOG with SecureTransport details\nb7e1c81 SecureTransport: allow overriding a bad certificate\n24e53d2 Rename GIT_SSL to GIT_OPENSSL\n70b852c Silence unused warnings when not using OpenSSL\n6946a3b Abstract away the TLS stream implementation\n6bb54cb Add a SecureTransport TLS channel\nd369d71 config: peek returns '\\n' on EOF; handle in write\n6dc5587 config: ensure we can write to an empty file\n2c8c00c config: validate config keys\n23fb400 config: test that we validate the key\n69c333f Merge pull request #3064 from rcorre/config-write-fix\n63e8b08 Merge branch 'attr-ignore'\nc02a0e4 attr_file: fix subdirectory attr case.\nc6bf03b Add failing subdirectory gitignore attr test.\n27fa747 Merge pull request #3032 from jfultz/index-file-modes\nf564017 Merge pull request #3065 from cthomas/master\nfc6f044 Fix for Issue #3023 tests fail with no network\naaf42c8 Merge pull request #3051 from jeffhostetler/jeffhostetler/memleak_windows_tls_data\n9a810c5 git_config_delete: search until last section.\nf56a417 Specify mock config file content in test.\na060ccc Unittest to validate config entry deletion bug.\n7636f74 Merge pull request #2992 from ethomson/rebase_fixes\n3a63e8c Merge pull request #3060 from ethomson/2851\nd328268 Fix index-adding functions to know when to trust filemodes.\naa9bb42 rebase: correct documentation, CHANGELOG\n94c988f rebase: include checkout opts within rebase opts\n7838235 rebase: test checkout options for rebase\nf3a199d rebase: init and open take a rebase_options\n5ae3853 rebase: take `checkout_options` where appropriate\n649834f reset: `git_checkout_options` is `const`\neaf0d68 rebase: block rebase_commit with unstaged changes\n49b3ddf rebase: commit should return GIT_EUNMERGED\n30640aa rebase: identify a rebase that has not started\ne009a70 config_file: comment char can be invalid escape\n7f2e61f config_file: parse multilines generously\n08c4521 Merge pull request #3024 from git-up/diff_merge_fix\nefc2fec push: report the update plan to the caller\n06c985d Rename routine to free TLS data\n4c02d39 Merge pull request #3016 from pks-t/ignore-exclude-fix\na0e652d Merge pull request #2999 from pks-t/submodule-set-url\na5bf599 Merge pull request #3047 from git-up/diff_fixes\nc694f9f Merge pull request #3052 from jeffhostetler/jeffhostetler/memleak_test_core_mkdir\ne3737a4 Fix memleak in test/core/mkdir reported by CRTDBG\nd3fb7d9 Remove DllMain now that TLS data freed by threads\nf5ffb40 Also fix leak of TLS data on main thread.\n55c5f75 Attempt to fix Windows TLS memory leak.\n4f35860 ignore: fix negative ignores without wildcards.\nc332bb7 Merge pull request #3042 from libgit2/cmn/odd-slowdown\n6f80bf4 Merge pull request #3037 from libgit2/cmn/hide-then-push\nfa7281d Merge pull request #3039 from jeffhostetler/jeffhostetler/msvc_crtdbg\n6598aa7 Oops...need bitwise, not logical negation.\ndb85374 Fixed GIT_DIFF_UPDATE_INDEX not being aware of executable bit changes\ncc93ad1 Removed unnecessary condition\n35df76b Use git_oid_cpy() instead of memcpy()\nd06c589 Add MSVC CRTDBG memory leak reporting.\na054169 revwalk: detect when we're out of interesting commits\n05d9202 revwalk: reword the push text\n129788a Implement git_submodule_set_branch.\n50fdfe2 revwalk: don't insert uninteresting commits into the queue\n5a503ff revwalk: add failing test for hiding and then pushing a commit\n67db2bd Fix git_checkout_tree() to do index filemodes correctly on Windows.\nb978082 Make sure to also update delta->nfiles when merging diffs\n\ngit-subtree-dir: deps/libgit2\ngit-subtree-split: 9f1af7f279e9f5cbd03c9a9d78fcba77a1c2c64c","distinct":true,"url":"https://api.github.com/repos/jacquesg/p5-Git-Raw/commits/7c9f4c01c4f6e767d2a74ed8b9dcd1432d54dce0"},{"sha":"7c36f0d24d12aeb97ac62f6d41c8618f9975dd65","author":{"email":"f3ffc7264a97a0f843921c35b864bcd6ac1a0f3f@striata.com","name":"Jacques Germishuys"},"message":"Merge commit '7c9f4c01c4f6e767d2a74ed8b9dcd1432d54dce0' into jacquesg/update-libgit2","distinct":true,"url":"https://api.github.com/repos/jacquesg/p5-Git-Raw/commits/7c36f0d24d12aeb97ac62f6d41c8618f9975dd65"},{"sha":"440c30acc58764e4f481be732bfec6ed9d5b1ae4","author":{"email":"f3ffc7264a97a0f843921c35b864bcd6ac1a0f3f@striata.com","name":"Jacques Germishuys"},"message":"inc/MakeMaker.pm: Define GIT_OPENSSL (used to be GIT_SSL)","distinct":true,"url":"https://api.github.com/repos/jacquesg/p5-Git-Raw/commits/440c30acc58764e4f481be732bfec6ed9d5b1ae4"},{"sha":"76483ee89a25dc8cc94e4db2fe4784b217d8bbd1","author":{"email":"f3ffc7264a97a0f843921c35b864bcd6ac1a0f3f@striata.com","name":"Jacques Germishuys"},"message":"Packbuilder.xs: Added constants","distinct":true,"url":"https://api.github.com/repos/jacquesg/p5-Git-Raw/commits/76483ee89a25dc8cc94e4db2fe4784b217d8bbd1"},{"sha":"0f2df8018810f7e9c9f6db121ed6b92fa7b07d25","author":{"email":"f3ffc7264a97a0f843921c35b864bcd6ac1a0f3f@striata.com","name":"Jacques Germishuys"},"message":"t/02-commit.t: We're not at libgit2 0.23","distinct":true,"url":"https://api.github.com/repos/jacquesg/p5-Git-Raw/commits/0f2df8018810f7e9c9f6db121ed6b92fa7b07d25"},{"sha":"927ae9ea73ba244f2fd28da64c64d721f586c3e5","author":{"email":"f3ffc7264a97a0f843921c35b864bcd6ac1a0f3f@striata.com","name":"Jacques Germishuys"},"message":"WIP","distinct":true,"url":"https://api.github.com/repos/jacquesg/p5-Git-Raw/commits/927ae9ea73ba244f2fd28da64c64d721f586c3e5"}]}