summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* diff: deprecate diff_format_emailethomson/emailEdward Thomson2021-09-184-116/+139
| | | | `git_diff_format_email` is deprecated in favor of `git_email_create`.
* email: include renames by defaultEdward Thomson2021-09-183-5/+132
| | | | | `git format-patch` includes diffs with rename detection enabled by default when creating emails. Match this behavior.
* email: include binary diffs by defaultEdward Thomson2021-09-183-9/+70
| | | | | `git format-patch` includes binary diffs by default when creating emails. Match this behavior.
* diff: use `git_email_create` in `diff_format_email`Edward Thomson2021-09-181-142/+7
|
* email: introduce 'append_from_diff'Edward Thomson2021-09-182-1/+51
| | | | | Introduce `git_email__append_from_diff` so that we don't always overwrite the input buffer.
* diff_commit_as_email: use `email_create`Edward Thomson2021-09-181-10/+13
| | | | Move the `git_diff_commit_as_email` function to use `email_create`.
* email: allow `git_diff_commit_as_email` to take 0 as patch indexEdward Thomson2021-09-181-1/+0
| | | | | Allow a `0` patch index and `0` patch count; in this case, simply don't display these in the email.
* email: introduce `git_email_create_from_diff`Edward Thomson2021-09-184-53/+195
| | | | | | | | | Introduce a function to create an email from a diff and multiple inputs about the source of the diff. Creating an email from a diff requires many more inputs, and should be discouraged in favor of building directly from a commit, and is thus in the `sys` namespace.
* email: introduce `git_email_create_from_commit`Edward Thomson2021-09-184-0/+481
| | | | | | Create `git_email_*` which will encapsulate email creation and application, and `git_email_create_from_commit` in particular, which creates an email for a single commit.
* buf: introduce `git_buf_truncate_at`Edward Thomson2021-09-142-0/+8
|
* Merge pull request #6041 from Esri/duncan/typeofEdward Thomson2021-09-142-8/+2
|\ | | | | Use __typeof__ GNUC keyword for ISO C compatibility
| * Use __typeof__ GNUC keyword for ISO C compatibilityDuncan Thomson2021-09-082-8/+2
| |
* | Merge pull request #6039 from lhchavez/avoid-mmap-in-git-indexer-appendEdward Thomson2021-09-141-3/+37
|\ \ | | | | | | indexer: Avoid one `mmap(2)`/`munmap(2)` pair per `git_indexer_append` call
| * | Avoid double negatives in the justification for truncationlhchavez2021-09-081-2/+5
| | | | | | | | | | | | | | | Turns out, double negatives are harder to parse than positive statements.
| * | Only avoid `mmap(2)`/`ftruncate(2)` when in non-Windowslhchavez2021-09-081-2/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that if we use `mmap(2)`, non-Windows remote filesystems break due to permissions. If we don't, _Windows_ remote filesystems break due to lack of coherence between memory mapped views of the file and direct I/O operations done to the files. To break out of this impossible situation, conditionally-compile versions of Windows-specific `write_at` and `append_to_pack`.
| * | Also remove a `ftruncate(2)` call in `git_indexer_commit`lhchavez2021-09-071-6/+0
| | | | | | | | | | | | | | | | | | Now that we're not using `mmap(2)` for writing stuff, we don't need to truncate the file afterwards, since it'll have the correct size at the end of the process. Whee~!
| * | indexer: Avoid one `mmap(2)`/`munmap(2)` pair per `git_indexer_append` calllhchavez2021-09-071-47/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes `append_to_pack` completely rely on `p_pwrite` to do all its I/O instead of splitting it between `p_pwrite` and a `mmap(2)`/`munmap(2)`+`memcpy(3)`. This saves a good chunk of user CPU time and avoids making two syscalls per round, but doesn't really cut down a lot of wall time (~1% on cloning the [git](https://github.com/git/git.git) repository).
* | | Merge pull request #6031 from libgit2/ethomson/extensionsEdward Thomson2021-09-147-46/+276
|\ \ \ | | | | | | | | Support custom git extensions
| * | | common: support custom repository extensionsethomson/extensionsEdward Thomson2021-09-046-4/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to specify additional repository extensions that they want to support. For example, callers can specify that they support `preciousObjects` and then may open repositories that support `extensions.preciousObjects`. Similarly, callers may opt out of supporting extensions that the library itself supports.
| * | | repo: refactor extensions tests into their own fileEdward Thomson2021-09-032-42/+44
| | | |
* | | | Merge pull request #6045 from punkymaniac/qa-fix-coding-style-pointerEdward Thomson2021-09-1434-76/+76
|\ \ \ \ | | | | | | | | | | Fix coding style for pointer
| * | | | Fix coding style for pointerpunkymaniac2021-09-0934-76/+76
| | |_|/ | |/| | | | | | | | | | Make some syntax change to follow coding style.
* | | | Merge pull request #6043 from basile-henry/config-multiline-comment-charsEdward Thomson2021-09-143-1/+13
|\ \ \ \ | | | | | | | | | | Fix config parsing for multiline with multiple quoted comment chars
| * | | | Fix multiline strip_comments logicBasile Henry2021-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The strip_comments function uses the count of quotes to know if a comment char (';' or '#') is the start of a comment or part of the multiline as a string. Unfortunately converting the count of quotes from previous lines to a boolean meant that it would only work as expected in some cases (0 quotes or an odd number of quotes).
| * | | | Add test config parsingBasile Henry2021-09-092-0/+12
| |/ / / | | | | | | | | | | | | | | | | This tests parsing a multiline string containing multiple quoted comment chars. See #6019
* | | | Merge pull request #6047 from libgit2/ethomson/notes_cleanupEdward Thomson2021-09-141-28/+28
|\ \ \ \ | |/ / / |/| | | notes: use a buffer internally
| * | | notes: use a buffer internallyethomson/notes_cleanupEdward Thomson2021-09-101-28/+28
|/ / / | | | | | | | | | Code cleanup to use `git_buf`s instead of simple c strings.
* | | README: update build badges for our branchesEdward Thomson2021-09-051-1/+1
| |/ |/|
* | Merge pull request #6032 from lhchavez/git-extern-git-remote-name-is-validEdward Thomson2021-09-041-1/+1
|\ \ | |/ |/|
| * remote: Mark `git_remote_name_is_valid` as `GIT_EXTERN`lhchavez2021-09-041-1/+1
|/ | | | | | | This change makes `git_remote_name_is_valid` be part of the public interface of the library. This is needed for other language bindings to be able to find this symbol (like in git2go, when linking against libgit2 dynamically).
* Merge pull request #6029 from arroz/fix_6028Edward Thomson2021-09-021-1/+2
|\ | | | | #6028: Check if `threadstate->error_t.message` is not `git_buf__initbuf` before freeing.
| * #6028: Check if `threadstate->error_t.message` is not `git_buf__initbuf` ↵Miguel Arroz2021-09-021-1/+2
|/ | | | | | before freeing. This follows the same principle as `buffer.c` where the same check is done before freeing the buffer. It fixes the crash described in #6028.
* url: ensure minimum components for formattingv1.2.0maint/v1.2Edward Thomson2021-09-011-2/+3
|
* url: ensure minimum components for formattingEdward Thomson2021-09-011-0/+3
|
* Merge pull request #6026 from libgit2/ethomson/proxyEdward Thomson2021-09-0114-107/+565
|\ | | | | Update proxy configuration
| * remote: refactor proxy detectionEdward Thomson2021-09-017-221/+238
| | | | | | | | | | | | | | | | | | | | Update the proxy detection for a remote. 1. Honor `http.<url>.proxy` syntax for a remote's direct URL and parent URLs. 2. Honor an empty configuration URL to override a proxy configuration. Add tests to ensure that configuration specificity is honored.
| * url: introduce `git_net_url_dup`Edward Thomson2021-09-012-0/+43
| |
| * url: introduce `git_net_url_matches_pattern_list`Edward Thomson2021-09-013-0/+71
| | | | | | | | | | | | Provide a utility method on a url to determine if it matches any pattern in a comma-separated list, similar to what one would find in `NO_PROXY` environment variables.
| * url: introduce `git_net_url_matches_pattern`Edward Thomson2021-09-013-0/+114
| | | | | | | | | | Provide a method to determine if a given URL matches a host:port pattern like the ones found in `NO_PROXY` environment variables.
| * tests: create the network::url test hierarcyEdward Thomson2021-09-013-59/+59
| |
| * util: introduce `git__strlcmp`Edward Thomson2021-09-012-0/+22
| | | | | | | | | | | | | | Introduce a utility function that compares a NUL terminated string to a possibly not-NUL terminated string with length. This is similar to `strncmp` but with an added check to ensure that the lengths match (not just the `size` portion of the two strings).
| * Add NO_PROXY env supportMathieu Parent2021-09-016-9/+200
|/ | | | | | Item 2 of 3 from #4164 Signed-off-by: Mathieu Parent <math.parent@gmail.com>
* Merge pull request #6024 from lhchavez/fix-possible-null-pointer-dereferenceEdward Thomson2021-08-311-1/+2
|\ | | | | Fix a possible null pointer dereference
| * Fix a possible null pointer dereferencelhchavez2021-08-311-1/+2
|/ | | | | | | | This change fixes a possible null pointer dereference if anything inside `git_commit_graph_writer_add_index_file` fails before the packfile being valid. https://scan6.coverity.com/reports.htm#v52218/p10377/fileInstanceId=122935896&defectInstanceId=32525576&mergedDefectId=1461634
* v1.2: update version informationEdward Thomson2021-08-313-5/+5
|
* v1.2: changelogEdward Thomson2021-08-311-16/+170
|
* Merge pull request #5943 from kcsaul/fix/5851Edward Thomson2021-08-301-0/+6
|\ | | | | Fix worktree iteration when repository has no common directory
| * repo: fix worktree iteration when repo has no common directoryKevin Saul2021-07-111-0/+6
| | | | | | | | | | | | | | | | | | | | When applying an operation to a repository created without a common directory, which is known to occur in scenarios where custom odb/refdb backends are used, git_repository_foreach_worktree currently asserts while attempting to open the repository located in the common directory. Fix this issue by applying operation to repository supplied when there are no linked worktrees to iterate (implied by common directory being empty).
* | Merge pull request #6022 from lollipopman/connect-proxy-host-headerEdward Thomson2021-08-301-1/+1
|\ \ | | | | | | Set Host Header to match CONNECT authority target
| * | Set Host Header to match CONNECT authority targetJesse Hathaway2021-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, for CONNECT requests, the Host header was set to the host and port of the target http proxy. However, per the rfc7230 for HTTP/1.1 this is incorrect as the Host header should match the target of the CONNECT request, as detailed in section 5.3.3 & 5.4. 5.3.3. authority-form The authority-form of request-target is only used for CONNECT requests (Section 4.3.6 of [RFC7231]). authority-form = authority When making a CONNECT request to establish a tunnel through one or more proxies, a client MUST send only the target URI's authority component (excluding any userinfo and its "@" delimiter) as the request-target. For example, CONNECT www.example.com:80 HTTP/1.1 5.4. Host <snip> A client MUST send a Host header field in all HTTP/1.1 request messages. If the target URI includes an authority component, then a client MUST send a field-value for Host that is identical to that authority component, excluding any userinfo subcomponent and its "@" delimiter (Section 2.7.1). If the authority component is missing or undefined for the target URI, then a client MUST send a Host header field with an empty field-value. This issue was noticed when proxying requests through HAProxy 2.2 which rejects these invalid http requests.
View Lorry Controller Status