summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'worktree_prunable' (PR #5712)HEADmainEdward Thomson2023-05-163-11/+41
|\
| * worktree: document that is_prunable sets error messagesEdward Thomson2023-05-161-1/+3
| * worktree: update prunable to reflect refactoringsEdward Thomson2023-05-161-11/+11
| * Refactor git_worktree_is_prunable slightly to fix memory leakReginald McLean2023-05-161-10/+16
| * Added check if gitdir exists in is_prunable()Reginald McLean2023-05-161-0/+9
| * Added missing is_prunable testReginald McLean2023-05-161-0/+13
|/
* Merge pull request #6535 from libgit2/ethomson/timeoutsEdward Thomson2023-05-1345-410/+779
|\
| * clone: skip timeout tests on WinHTTPethomson/timeoutsEdward Thomson2023-05-131-0/+16
| * win32: use WSAGetLastError to determine blockingEdward Thomson2023-05-131-1/+14
| * win32: getsockopt takes a `char *` instead of a `void *`Edward Thomson2023-05-131-1/+2
| * cmake: use `check_symbol_exists` for rand functionsEdward Thomson2023-05-131-2/+2
| * posix: use WSAPoll on win32Edward Thomson2023-05-133-2/+10
| * posix: introduce p_poll emulation with selectEdward Thomson2023-05-135-5/+85
| * streams: sockets are non-blocking and can timeoutEdward Thomson2023-05-139-30/+335
| * ci: update to poxygit v0.6.0Edward Thomson2023-05-131-1/+1
| * net: move `gitno` buffer to `staticstr`Edward Thomson2023-05-1322-237/+151
| * net: move rfc2818 hostname / wildcard matching to utilEdward Thomson2023-05-137-78/+80
| * stransport: store error informationEdward Thomson2023-05-131-11/+28
| * util: make monotonic time fn return msEdward Thomson2023-05-1310-53/+66
|/
* Merge pull request #5722 from libgit2/ethomson/tlsdata_failEdward Thomson2023-05-137-33/+118
|\
| * threadstate: don't use an unnecessary macroEdward Thomson2023-05-133-11/+9
| * oid: don't assume thread local state was initializedEdward Thomson2023-05-135-13/+45
| * errors: don't rely on tls data workingEdward Thomson2023-05-131-13/+68
| * errors: drop unneccessary g_git prefixEdward Thomson2023-05-131-6/+6
|/
* Merge pull request #6488 from libgit2/ethomson/workflowEdward Thomson2023-05-134-126/+146
|\
| * reusableethomson/workflowEdward Thomson2023-02-172-60/+73
| * nightlyEdward Thomson2023-02-171-29/+14
| * fixup! fixup! actions: simplify execution with composite actionEdward Thomson2023-02-161-2/+2
| * fixup! actions: simplify execution with composite actionEdward Thomson2023-02-161-1/+1
| * actions: simplify execution with composite actionEdward Thomson2023-02-162-37/+59
* | Merge pull request #6561 from libgit2/ethomson/xdiffEdward Thomson2023-05-1312-129/+133
|\ \
| * | xdiff: update to xdiff from git 2.40.1ethomson/xdiffEdward Thomson2023-05-1111-129/+131
| * | util: add GIT_UNUSED_ARGEdward Thomson2023-05-111-0/+2
* | | Merge pull request #6558 from DimitryAndric/fix-qsort-variants-2Edward Thomson2023-05-125-23/+41
|\ \ \ | |/ / |/| |
| * | cmake: refactor `check_prototype_definition`Edward Thomson2023-05-123-15/+21
| * | cmake: simplify QSORT namesEdward Thomson2023-05-123-18/+20
| * | Work around -Werror problems when detecting qsort variantsDimitry Andric2023-05-091-0/+10
* | | Merge pull request #6557 from libgit2/ethomson/shallowEdward Thomson2023-05-0960-76/+1628
|\ \ \ | |/ / |/| |
| * | fetch: remove `unshallow` optionEdward Thomson2023-05-093-13/+15
| * | oid: use an oid array instead of shallowarrayEdward Thomson2023-05-0918-176/+304
| * | cli: add --depth option to cloneEdward Thomson2023-05-081-6/+22
| * | grafts: make `from_file` be `open_or_refresh`Edward Thomson2023-05-083-8/+18
| * | shallow: cleanup whitespace in testsEdward Thomson2023-05-081-16/+16
| * | shallow: don't default to -1 for depthEdward Thomson2023-05-083-12/+9
| * | grafts: handle SHA256 graft filesEdward Thomson2023-05-085-12/+24
| * | grafts: use `git_parse` to parse object IDsEdward Thomson2023-05-081-9/+7
| * | futils: use SHA256 for checksums alwaysEdward Thomson2023-05-082-7/+11
| * | shallow: avoid unnecessary pkt freeEdward Thomson2023-05-081-7/+9
| * | transport: transports understand oid typeEdward Thomson2023-04-253-12/+24
| * | shallow: don't assume SHA1Edward Thomson2023-04-252-26/+46
View Lorry Controller Status