summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* pcre: upgrade to 8.44ethomson/pcreEdward Thomson2020-10-045-25/+26
|
* pcre: upgrade to 8.43Edward Thomson2020-10-044-12/+22
|
* pcre: include the licenseEdward Thomson2020-10-041-0/+93
| | | | | We included their COPYING file, which was _not_ in fact their license. Add the LICENSE file as well.
* p_chmod: Android compatibilitykevinlul2020-10-041-1/+13
| | | | | | Fix #5565 Pre-Android 5 did not implement a virtual filesystem atop FAT partitions for Unix permissions, which causes chmod to fail. However, Unix permissions have no effect on Android anyway as file permissions are not actually managed this way, so treating it as a no-op across all Android is safe.
* Merge pull request #5576 from lollipopman/double-authEdward Thomson2020-10-041-2/+5
|\ | | | | httpclient: only free challenges for current_server type
| * httpclient: only free challenges for current_server typeJesse Hathaway2020-07-101-2/+5
| | | | | | | | | | | | | | | | | | | | | | Prior to this commit we freed both the server and proxy auth challenges in git_http_client_read_response. This works when the proxy needs auth or when the server needs auth, but it does not work when both the proxy and the server need auth as we erroneously remove the server auth challenge before we have added them as server credentials. Instead only remove the challenges for the current_server type. Co-authored-by: Stephen Gelman <ssgelm@gmail.com>
* | Merge pull request #5581 from libgit2/ethomson/mainbranchEdward Thomson2020-10-047-46/+181
|\ \ | | | | | | Respect `init.defaultBranch` setting
| * | refs: remove "master" branch constantethomson/mainbranchEdward Thomson2020-08-031-1/+0
| | | | | | | | | | | | | | | We don't use "master" as a hardcoded default in as many places; remove the now unused master branch constant.
| * | remote: update the default remote branchEdward Thomson2020-08-031-14/+27
| | | | | | | | | | | | | | | | | | When the remote does not tell us its default, we have to guess what the default branch should be. Use our local initial branch configuration to inform the remote branch default when we clone.
| * | clone: don't assume the default branch nameEdward Thomson2020-08-031-4/+4
| | | | | | | | | | | | | | | We derive the branch name, even in our code, we shouldn't assume that the branch will be "master".
| * | clone: respect init.defaultBranch when emptyEdward Thomson2020-08-032-2/+43
| | | | | | | | | | | | | | | | | | When cloning an empty repository, we need to guess what the branch structure should be; instead of hardcoding `master`, use the `init.defaultBranch` setting it if it provided.
| * | repo: teach isempty about default branch configEdward Thomson2020-08-031-9/+11
| | | | | | | | | | | | | | | | | | The git_repository_isempty function now respects the init.defaultbranch setting (instead of hardcoding "master") to understand if a repository is empty or not.
| * | repo: add git_repository_initialbranchEdward Thomson2020-08-032-0/+40
| | | | | | | | | | | | | | | | | | Provide a helper function to get the initial branch for a repository, respecting the `init.defaultBranch` configuration option, if set, and returning the "default default" (currently `master`) otherwise.
| * | repo: honor the init.defaultBranch settingEdward Thomson2020-08-032-16/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of a push towards more inclusive language, git is reconsidering using "master" as the default branch name. As a first step, this setting will be configurable with the `init.defaultBranch` configuration option. Honor this during repository initialization. During initialization, we will create an initial branch: 1. Using the `initial_head` setting, if specified; 2. Using the `HEAD` configured in a template, if it exists; 3. Using the `init.defaultBranch` configuration option, if it is set; or 4. Using `master` in the absence of additional configuration.
* | | Merge pull request #5620 from dlax/parse-patch-add-delete-no-indexEdward Thomson2020-10-042-0/+24
|\ \ \ | | | | | | | | patch_parse: handle absence of "index" header for new/deleted cases
| * | | patch_parse: handle absence of "index" header for new/deleted casesDenis Laxalde2020-08-292-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows up on 11de594f85479e4804b07dc4f7b33cfe9212bea0 which added support for parsing patches without extended headers (the "index <hash>..<hash> <mode>" line); issue #5267. We now allow transition from "file mode" state to "path" state directly if there is no "index", which will happen for patches adding or deleting files as demonstrated in added test case.
* | | | Merge pull request #5626 from csware/parse_boolEdward Thomson2020-10-042-6/+78
|\ \ \ \ | | | | | | | | | | boolean config parsing fails in some cases with mapped values
| * | | | Improve formattingSven Strickroth2020-09-091-1/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Add boolean tests for "on" and "off"Sven Strickroth2020-09-091-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Support empty values for git_config_get_mapped and git_config_lookup_map_valueSven Strickroth2020-09-092-6/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Fix parsing boolean config values when using git_config_get_mapped and ↵Sven Strickroth2020-09-092-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git_config_lookup_map_value Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | | Merge pull request #5629 from csware/config-multiline-parseEdward Thomson2020-10-043-1/+16
|\ \ \ \ \ | | | | | | | | | | | | Fix config file parsing with multi line values containing quoted parts
| * | | | | Fix config file parsing with multi line values containing quoted partsSven Strickroth2020-09-183-1/+16
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | | Merge pull request #5636 from libgit2/pks-release-build-warningsEdward Thomson2020-10-043-3/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix release build warnings
| * | | | | sysdir: fix formatting error message with NULL stringpks-release-build-warningsPatrick Steinhardt2020-09-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to the template dir, we pass in a `NULL` pointer for the filename. That's perfectly fine, but if we're failing to find the template directory then we'll creat an error message with the `NULL` pointer passed in. Fix the issue by setting different error messages based on whether the filename is given or not. This even makes sense, as we're not searching for a file in case we have no `name`, but for a directory. So the error would've been misleading anyway.
| * | | | | patch_parse: silence maybe-uninitialized warningPatrick Steinhardt2020-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building libgit2 with the release build type, then GCC complains about mode being potentially uninitialized. While this seems to be a false positive, let's silence this warning by zero-initializing the mode.
| * | | | | refs: fix potential free of uninitialized variablePatrick Steinhardt2020-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `signature` variable in `git_reference_rename` isn't initialized and neither does `git_reference__log_signature` always do. So if the latter function fails, we'll call `git_signature_free` on this unininitialized variable. Fix the issue by initializing the pointer with `NULL`.
* | | | | | Merge pull request #5631 from csware/issue-5611Patrick Steinhardt2020-09-181-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix deprecation links inside of documentation not working
| * | | | | Fix deprecation links inside of documentation not workingSven Strickroth2020-09-101-1/+5
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | | Merge pull request #5632 from csware/winhttp_typoPatrick Steinhardt2020-09-181-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix typo: Make ifndef macroname the same as the define name
| * | | | | Fix typo: Make ifndef macroname the same as the define nameSven Strickroth2020-09-101-2/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | | Merge pull request #5619 from ddevault/diffstat-segfaultEdward Thomson2020-09-172-5/+41
|\ \ \ \ \ | | | | | | | | | | | | diff stats: fix segfaults with new files
| * | | | | diff stats: fix segfaults with new filesDrew DeVault2020-09-162-5/+41
| | |/ / / | |/| | |
* | | | | Merge pull request #5633 from csware/winhttp1.3Edward Thomson2020-09-151-5/+16
|\ \ \ \ \ | | | | | | | | | | | | WinHTTP: Try to use TLS1.3
| * | | | | WinHTTP: Try to use TLS1.3Sven Strickroth2020-09-141-5/+16
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | | Merge pull request #5628 from interkosmos/masterEdward Thomson2020-09-151-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Fixed includes for FreeBSD
| * | | | Removed FreeBSD-related macros.Philipp2020-09-141-7/+1
| | | | |
| * | | | Fixed includes for FreeBSD.Philipp2020-09-091-1/+7
|/ / / /
* | | | Merge pull request #5624 from csware/http-upgrade-headerEdward Thomson2020-09-081-5/+0
|\ \ \ \ | | | | | | | | | | Don't fail if a HTTP server announces he supports a protocol upgrade
| * | | | Don't fail if a HTTP server announces he supports a protocol upgradeSven Strickroth2020-09-081-5/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf. RFC7230 section 6.7, an Upgrade header in a normal response merely informs the client that the server supports upgrading to other protocols, and the client can ask for such an upgrade in a later request. The server requiring an upgrade is via the 426 Upgrade Required response code, not the mere presence of the Upgrade response header. (closes issue #5573) Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | Merge pull request #5621 from kim/null-safe-git_net_url_is_default_portEdward Thomson2020-09-011-1/+6
|\ \ \ \ | | | | | | | | | | Return false instead of segfaulting when checking for default port
| * | | | Return false instead of segfaulting when checking for default portKim Altintop2020-08-311-1/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | `default_port_for_scheme` returns NULL if the scheme is not one of the builtin ones. This may cause a segmentation fault if a custom transport URL happens to contain a port number, and this code path is triggered (e.g. by setting git_fetch_options->update_fetchhead to 1).
* | | | Merge pull request #5612 from mmuman/haikuEdward Thomson2020-08-311-1/+8
|\ \ \ \ | | | | | | | | | | deps: ntlmclient: fix htonll for Haiku
| * | | | deps: ntlmclient: #error out on unknown platformsFrançois Revol2020-08-211-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | We explicitly pass win32 & macOS, although some old version might not have it.
| * | | | deps: ntlmclient: fix htonll for HaikuFrançois Revol2020-08-211-0/+3
| |/ / / | | | | | | | | | | | | Use B_HOST_TO_BENDIAN_INT64 for that.
* | | | Merge pull request #5615 from libgit2/pks/azure-remove-docjobEdward Thomson2020-08-311-37/+0
|\ \ \ \ | |_|/ / |/| | | azure: Remove job generating documentation
| * | | azure: Remove job generating documentationpks/azure-remove-docjobPatrick Steinhardt2020-08-241-37/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | With the recent addition of GitHub Actions to our CI infrastructure, we now have two jobs which generate documentation: once in GHA, once in Azure. Naturally, as they both want to update the same branch, they race against each other and one of both jobs will fail. Fix this by removing the documentation job from Azure.
* | | Merge pull request #5617 from muhkuh-sys/masterEdward Thomson2020-08-281-1/+1
|\ \ \ | | | | | | | | Fix crash in git_describe_commit when opts are NULL.
| * | | Fix crash in git_describe_commit when opts are NULL.Christoph Thelen2020-08-271-1/+1
|/ / / | | | | | | | | | | | | The argument "opts" can be NULL, which selects default options. Do not access "opts" directly but only the normalized copy.
* | | Merge pull request #5600 from andrewhickman/fix-double-freePatrick Steinhardt2020-08-241-2/+5
|\ \ \ | | | | | | | | Fix `git_mwindow_scan_recently_used` spuriously returning true
View Lorry Controller Status