summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* cmake: stylistic refactoringEdward Thomson2021-10-181-283/+285
| | | | | Ensure that we always use lowercase function names, and that we do not have spaces preceding open parentheses, for consistency.
* trace: always enabledEdward Thomson2021-10-184-37/+0
| | | | There's no need to make tracing opt-in; it should always be included.
* str: introduce `git_str` for internal, `git_buf` is externalethomson/gitstrEdward Thomson2021-10-17148-3723/+4231
| | | | | | | | | | | | | | | | | | | | | | | | | | | libgit2 has two distinct requirements that were previously solved by `git_buf`. We require: 1. A general purpose string class that provides a number of utility APIs for manipulating data (eg, concatenating, truncating, etc). 2. A structure that we can use to return strings to callers that they can take ownership of. By using a single class (`git_buf`) for both of these purposes, we have confused the API to the point that refactorings are difficult and reasoning about correctness is also difficult. Move the utility class `git_buf` to be called `git_str`: this represents its general purpose, as an internal string buffer class. The name also is an homage to Junio Hamano ("gitstr"). The public API remains `git_buf`, and has a much smaller footprint. It is generally only used as an "out" param with strict requirements that follow the documentation. (Exceptions exist for some legacy APIs to avoid breaking callers unnecessarily.) Utility functions exist to convert a user-specified `git_buf` to a `git_str` so that we can call internal functions, then converting it back again.
* Merge pull request #6082 from libgit2/ethomson/oidEdward Thomson2021-10-1721-95/+118
|\ | | | | hash: separate hashes and git_oid
| * futils: use a particular hash not a git_oidEdward Thomson2021-10-022-7/+13
| | | | | | | | | | | | In `git_futils_readbuffer_updated`, always take a particular hash instead of a `git_oid`. This lets us change the checksum algorithm independently of `git_oid` usage.
| * hash: hash functions operate on byte arrays not git_oidsEdward Thomson2021-10-0219-42/+43
| | | | | | | | | | | | Separate the concerns of the hash functions from the git_oid functions. The git_oid structure will need to understand either SHA1 or SHA256; the hash functions should only deal with the appropriate one of these.
| * hash: accept the algorithm in inputsEdward Thomson2021-10-0113-50/+66
| |
| * hash: don't abbreviate algorithmEdward Thomson2021-10-012-13/+13
| |
* | diff: make the default rename_limit 1000Edward Thomson2021-10-131-1/+1
|/ | | git's default rename limit is 1000, ours should match.
* Merge pull request #6076 from libgit2/ethomson/oidarray_disposeEdward Thomson2021-09-272-2/+11
|\ | | | | oidarray: introduce `git_oidarray_dispose`
| * oidarray: introduce `git_oidarray_dispose`ethomson/oidarray_disposeEdward Thomson2021-09-262-2/+11
| | | | | | | | | | | | Since users are disposing the _contents_ of the oidarray, not freeing the oidarray itself, the proper cleanup function is `git_oidarray_dispose`. Deprecate `git_oidarray_free`.
* | Merge pull request #6075 from libgit2/ethomson/attr_longpathsEdward Thomson2021-09-274-9/+6
|\ \
| * | attr_file: don't take the `repo` as an argethomson/attr_longpathsEdward Thomson2021-09-264-7/+5
| | | | | | | | | | | | The `repo` argument is now unnecessary. Remove it.
| * | attr_file: don't validate workdir paths in attr lookupsEdward Thomson2021-09-261-2/+1
| |/ | | | | | | | | | | | | | | | | | | When looking up attributes for a file, we construct an absolute path to the queried file within the working directory so that we can accept both absolute paths and working directory relative paths. We then trim the leading working directory path to give us an in-repo path. Since we only want the in-repo path to look up attributes - and not to read it from disk - we don't need to validate its length.
* | Merge pull request #6073 from libgit2/ethomson/attr_lookupsEdward Thomson2021-09-275-23/+28
|\ \
| * | attr: ensure lookups are on repo-relative pathsethomson/attr_lookupsEdward Thomson2021-09-251-0/+2
| | | | | | | | | | | | | | | Attribute lookups are done on paths relative to the repository. Fail if erroneously presented with an absolute path.
| * | checkout: always provide a path for attribute lookupEdward Thomson2021-09-251-7/+6
| | | | | | | | | | | | | | | Always pass a working-directory relative path to attribute lookups during checkout.
| * | blob: improve `create_from_disk` attribute lookupsEdward Thomson2021-09-251-5/+4
| | | | | | | | | | | | | | | | | | Resolve absolute paths to be working directory relative when looking up attributes. Importantly, now we will _never_ pass an absolute path down to attribute lookup functions.
| * | repository: improve `hashfile` for absolute pathsEdward Thomson2021-09-251-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `git_repository_hashfile` is handed an absolute path, it determines whether the path is within the repository's working directory or not. This is necessary when there is no `as_path` specified. If the path is within the working directory, then the given path should be used for attribute lookups (it is the effective `as_path`). If it is not within the working directory, then it is _not_ eligible. Importantly, now we will _never_ pass an absolute path down to attribute lookup functions.
| * | win32: posixify the output of p_getcwdEdward Thomson2021-09-251-0/+3
| |/ | | | | | | | | | | | | Make p_getcwd match the rest of our win32 path handling semantics. (This is currently only used in tests, which is why this disparity went unnoticed.)
* | buf: common_prefix takes a string arrayethomson/strarrayEdward Thomson2021-09-263-8/+9
|/ | | | | | `git_strarray` is a public-facing type. Change `git_buf_text_common_prefix` to not use it, and just take an array of strings instead.
* Merge pull request #6067 from libgit2/ethomson/filter_commit_idEdward Thomson2021-09-215-22/+58
|\ | | | | filter: use a `git_oid` in filter options, not a pointer
| * filter: use a `git_oid` in filter options, not a pointerethomson/filter_commit_idEdward Thomson2021-09-215-22/+58
| | | | | | | | | | | | | | Using a `git_oid *` in filter options was a mistake; it is a deviation from our typical pattern, and callers in some languages that GC may need very special treatment in order to pass both an options structure and a pointer outside of it.
* | email: don't clear buffer in append functionEdward Thomson2021-09-211-1/+0
|/ | | | | `git_email__append_from_diff` is meant to - well, append from a diff. Clearing the buffer, by definition, is not appending. Stop doing that.
* Merge pull request #6061 from libgit2/ethomson/emailEdward Thomson2021-09-205-173/+374
|\ | | | | Introduce `git_email_create`; deprecate `git_diff_format_email`
| * diff: deprecate diff_format_emailethomson/emailEdward Thomson2021-09-181-23/+23
| | | | | | | | `git_diff_format_email` is deprecated in favor of `git_email_create`.
| * email: include renames by defaultEdward Thomson2021-09-181-1/+7
| | | | | | | | | | `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-181-4/+8
| | | | | | | | | | `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: introduce `git_email_create_from_diff`Edward Thomson2021-09-181-27/+81
| | | | | | | | | | | | | | | | | | 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-181-0/+211
| | | | | | | | | | | | 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
| |
* | win32: allow empty environment variablesEdward Thomson2021-09-201-1/+1
| | | | | | | | | | A length of 0 indicates an error and GetLastError() will be set. If GetLastError() is unset then the environment variable has a length of 0.
* | Merge remote-tracking branch 'mathworks/longpath_filter_bug' into mainEdward Thomson2021-09-201-3/+4
|\ \
| * | If longpaths is true and filters are enabled, pass git_repository through ↵Laurence McGlashan2021-09-141-3/+4
| | | | | | | | | | | | | | | | | | the filtering code to ensure the cached longpath setting is returned. Fixes: #6054
* | | Merge pull request #6058 from mathworks/proxy_config_with_detached_remoteEdward Thomson2021-09-201-4/+11
|\ \ \ | | | | | | | | Allow proxy options when connecting with a detached remote.
| * | | Update remote.cLaurence McGlashan2021-09-181-1/+1
| | | | | | | | | | | | Initialise cfg variable.
| * | | Apply suggestions from code reviewLaurence McGlashan2021-09-181-7/+2
| | | | | | | | | | | | Co-authored-by: Edward Thomson <ethomson@github.com>
| * | | Allow proxy options when connecting with a detached remote.Laurence McGlashan2021-09-161-3/+15
| | | |
* | | | merge: Check file mode when resolving renames.Colin Stolley2021-09-151-2/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When determining if ours or theirs changed, we check the oids but not their respective file modes. This can lead to merges introducing incorrect file mode changes (eg., in a revert). A simple linear example might be: commit A - introduces file `foo` with chmod 0755 commit B - updates some unrelated file commit C - renames `foo` to `bar` and chmod 0644 If B is reverted, `bar` will unexpectedly acquire mode 0755.
* | | Merge pull request #6053 from stac47/ssh2_discoveryEdward Thomson2021-09-141-0/+7
|\ \ \ | |_|/ |/| | Discover libssh2 without pkg-config
| * | Update src/CMakeLists.txtLaurent Stacul2021-09-141-7/+7
| | | | | | | | | Co-authored-by: Edward Thomson <ethomson@github.com>
| * | Discover libssh2 without pkg-configLaurent Stacul2021-09-141-0/+7
| |/
* | 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`.
View Lorry Controller Status