Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | oidarray: introduce `git_oidarray_dispose`ethomson/oidarray_dispose | Edward Thomson | 2021-09-26 | 5 | -47/+77 |
| | | | | | | 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`. | ||||
* | changelog: separate releases with a horizontal rule | Edward Thomson | 2021-09-22 | 1 | -0/+18 |
| | |||||
* | changelog: fix typo | Edward Thomson | 2021-09-22 | 1 | -1/+1 |
| | |||||
* | Merge pull request #6069 from libgit2/ethomson/v1_3 | Edward Thomson | 2021-09-22 | 4 | -5/+51 |
|\ | | | | | v1.3.0 | ||||
| * | v1.3: update version numberethomson/v1_3 | Edward Thomson | 2021-09-22 | 3 | -5/+5 |
| | | |||||
| * | v1.3: changelog | Edward Thomson | 2021-09-22 | 1 | -0/+46 |
|/ | |||||
* | Merge pull request #6068 from libgit2/ethomson/diff_enum | Edward Thomson | 2021-09-22 | 1 | -4/+3 |
|\ | | | | | diff: update `GIT_DIFF_IGNORE_BLANK_LINES` | ||||
| * | diff: update `GIT_DIFF_IGNORE_BLANK_LINES`ethomson/diff_enum | Edward Thomson | 2021-09-21 | 1 | -4/+3 |
| | | | | | | | | | | `GIT_DIFF_IGNORE_BLANK_LINES` needs to be within a (signed) int, per the `enum` definition of ISO C. | ||||
* | | Merge pull request #6067 from libgit2/ethomson/filter_commit_id | Edward Thomson | 2021-09-21 | 9 | -33/+81 |
|\ \ | | | | | | | filter: use a `git_oid` in filter options, not a pointer | ||||
| * | | filter: use a `git_oid` in filter options, not a pointerethomson/filter_commit_id | Edward Thomson | 2021-09-21 | 9 | -33/+81 |
| |/ | | | | | | | | | | | | | 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. | ||||
* | | Merge pull request #6064 from libgit2/ethomson/ci_libssh2 | Edward Thomson | 2021-09-21 | 4 | -6/+4 |
|\ \ | | | | | | | ci: pull libssh2 from www.libssh2.org | ||||
| * | | ci: pull libssh2 from www.libssh2.orgethomson/ci_libssh2 | Edward Thomson | 2021-09-21 | 4 | -6/+4 |
| | | | | | | | | | | | | | | | libssh2.org and www.libssh2.org were previously identical; now this is a redirect. | ||||
* | | | Merge pull request #6066 from libgit2/ethomson/deprecation | Edward Thomson | 2021-09-21 | 2 | -8/+7 |
|\ \ \ | |_|/ |/| | | Fixes for deprecated APIs | ||||
| * | | rebase: fix (deprecated) signing testethomson/deprecation | Edward Thomson | 2021-09-21 | 1 | -7/+7 |
| | | | |||||
| * | | email: don't clear buffer in append function | Edward Thomson | 2021-09-21 | 1 | -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/email | Edward Thomson | 2021-09-20 | 12 | -267/+1026 |
|\ \ | | | | | | | Introduce `git_email_create`; deprecate `git_diff_format_email` | ||||
| * | | diff: deprecate diff_format_emailethomson/email | Edward Thomson | 2021-09-18 | 4 | -116/+139 |
| | | | | | | | | | | | | `git_diff_format_email` is deprecated in favor of `git_email_create`. | ||||
| * | | email: include renames by default | Edward Thomson | 2021-09-18 | 3 | -5/+132 |
| | | | | | | | | | | | | | | | `git format-patch` includes diffs with rename detection enabled by default when creating emails. Match this behavior. | ||||
| * | | email: include binary diffs by default | Edward Thomson | 2021-09-18 | 3 | -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 Thomson | 2021-09-18 | 1 | -142/+7 |
| | | | |||||
| * | | email: introduce 'append_from_diff' | Edward Thomson | 2021-09-18 | 2 | -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 Thomson | 2021-09-18 | 1 | -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 index | Edward Thomson | 2021-09-18 | 1 | -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 Thomson | 2021-09-18 | 4 | -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 Thomson | 2021-09-18 | 4 | -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 Thomson | 2021-09-14 | 2 | -0/+8 |
| | | | |||||
* | | | Merge pull request #6063 from libgit2/ethomson/win32_envvar | Edward Thomson | 2021-09-20 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | win32: allow empty environment variables | ||||
| * | | win32: allow empty environment variables | Edward Thomson | 2021-09-20 | 1 | -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 pull request #6020 from ↵ | Edward Thomson | 2021-09-20 | 1 | -3/+3 |
|\ \ | | | | | | | | | | | | | lolgear/refactoring/stdint_ifdef_condition_has_been_reverted Stdint header condition has been reverted. | ||||
| * | | include: stdint header condition has been reverted. | Dmitry Lobanov | 2021-08-30 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'sathieu/patch-1' into main | Edward Thomson | 2021-09-20 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | httpproxy: move empty string test above config | Edward Thomson | 2021-09-20 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | The configuration change will override the environment variable, so the environment variable check needs to come first. | ||||
| * | | | Add test to ensure empty proxy env behaves like unset env | Mathieu Parent | 2021-09-14 | 1 | -0/+4 |
| | | | | | | | | | | | | Signed-off-by: Mathieu Parent <math.parent@gmail.com> | ||||
* | | | | Merge branch 'longpath_filter_bug' into main | Edward Thomson | 2021-09-20 | 1 | -4/+23 |
|\ \ \ \ | |||||
| * | | | | win32: ensure content filtering occurs in longpath test | Edward Thomson | 2021-09-20 | 1 | -4/+23 |
|/ / / / | |||||
* | | | | Merge remote-tracking branch 'mathworks/longpath_filter_bug' into main | Edward Thomson | 2021-09-20 | 2 | -7/+28 |
|\ \ \ \ | |||||
| * | | | | Apply suggestions from code review | Laurence McGlashan | 2021-09-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | Co-authored-by: Edward Thomson <ethomson@github.com> | ||||
| * | | | | Refactor shared code in longpath test. | Laurence McGlashan | 2021-09-14 | 1 | -22/+12 |
| | | | | | |||||
| * | | | | If longpaths is true and filters are enabled, pass git_repository through ↵ | Laurence McGlashan | 2021-09-14 | 2 | -3/+32 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | the filtering code to ensure the cached longpath setting is returned. Fixes: #6054 | ||||
* | | | | Merge pull request #6058 from mathworks/proxy_config_with_detached_remote | Edward Thomson | 2021-09-20 | 2 | -5/+52 |
|\ \ \ \ | | | | | | | | | | | Allow proxy options when connecting with a detached remote. | ||||
| * | | | | Update remote.c | Laurence McGlashan | 2021-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Initialise cfg variable. | ||||
| * | | | | Apply suggestions from code review | Laurence McGlashan | 2021-09-18 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | Co-authored-by: Edward Thomson <ethomson@github.com> | ||||
| * | | | | Update formatting. | Laurence McGlashan | 2021-09-16 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Allow proxy options when connecting with a detached remote. | Laurence McGlashan | 2021-09-16 | 2 | -4/+56 |
| | | | | | |||||
* | | | | | Merge pull request #6060 from ccstolley/ccs_merge_bugfix | Edward Thomson | 2021-09-20 | 10 | -2/+65 |
|\ \ \ \ \ | | | | | | | | | | | | | merge: Check file mode when resolving renames | ||||
| * | | | | | Add test for revert+rename bug. | Colin Stolley | 2021-09-15 | 9 | -0/+60 |
| | | | | | | |||||
| * | | | | | merge: Check file mode when resolving renames. | Colin Stolley | 2021-09-15 | 1 | -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 #6050 from shijinglu/patch-1 | Edward Thomson | 2021-09-18 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Update README.md | ||||
| * | | | | Update README.md | shijing | 2021-09-12 | 1 | -0/+1 |
| |/ / / | | | | | | | | | Add git24j to the language bindings | ||||
* | | | | Merge pull request #6053 from stac47/ssh2_discovery | Edward Thomson | 2021-09-14 | 2 | -0/+20 |
|\ \ \ \ | |_|_|/ |/| | | | Discover libssh2 without pkg-config |