summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* buf: common_prefix takes a string arrayethomson/strarrayEdward Thomson2021-09-264-30/+16
| | | | | | `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.
* changelog: separate releases with a horizontal ruleEdward Thomson2021-09-221-0/+18
|
* changelog: fix typoEdward Thomson2021-09-221-1/+1
|
* Merge pull request #6069 from libgit2/ethomson/v1_3Edward Thomson2021-09-224-5/+51
|\ | | | | v1.3.0
| * v1.3: update version numberethomson/v1_3Edward Thomson2021-09-223-5/+5
| |
| * v1.3: changelogEdward Thomson2021-09-221-0/+46
|/
* Merge pull request #6068 from libgit2/ethomson/diff_enumEdward Thomson2021-09-221-4/+3
|\ | | | | diff: update `GIT_DIFF_IGNORE_BLANK_LINES`
| * diff: update `GIT_DIFF_IGNORE_BLANK_LINES`ethomson/diff_enumEdward Thomson2021-09-211-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_idEdward Thomson2021-09-219-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_idEdward Thomson2021-09-219-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_libssh2Edward Thomson2021-09-214-6/+4
|\ \ | | | | | | ci: pull libssh2 from www.libssh2.org
| * | ci: pull libssh2 from www.libssh2.orgethomson/ci_libssh2Edward Thomson2021-09-214-6/+4
| | | | | | | | | | | | | | | libssh2.org and www.libssh2.org were previously identical; now this is a redirect.
* | | Merge pull request #6066 from libgit2/ethomson/deprecationEdward Thomson2021-09-212-8/+7
|\ \ \ | |_|/ |/| | Fixes for deprecated APIs
| * | rebase: fix (deprecated) signing testethomson/deprecationEdward Thomson2021-09-211-7/+7
| | |
| * | 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-2012-267/+1026
|\ \ | | | | | | Introduce `git_email_create`; deprecate `git_diff_format_email`
| * | 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 #6063 from libgit2/ethomson/win32_envvarEdward Thomson2021-09-201-1/+1
|\ \ \ | |_|/ |/| | win32: allow empty environment variables
| * | 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 pull request #6020 from ↵Edward Thomson2021-09-201-3/+3
|\ \ | | | | | | | | | | | | lolgear/refactoring/stdint_ifdef_condition_has_been_reverted Stdint header condition has been reverted.
| * | include: stdint header condition has been reverted.Dmitry Lobanov2021-08-301-3/+3
| | |
* | | Merge branch 'sathieu/patch-1' into mainEdward Thomson2021-09-201-0/+9
|\ \ \
| * | | httpproxy: move empty string test above configEdward Thomson2021-09-201-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 envMathieu Parent2021-09-141-0/+4
| | | | | | | | | | | | Signed-off-by: Mathieu Parent <math.parent@gmail.com>
* | | | Merge branch 'longpath_filter_bug' into mainEdward Thomson2021-09-201-4/+23
|\ \ \ \
| * | | | win32: ensure content filtering occurs in longpath testEdward Thomson2021-09-201-4/+23
|/ / / /
* | | | Merge remote-tracking branch 'mathworks/longpath_filter_bug' into mainEdward Thomson2021-09-202-7/+28
|\ \ \ \
| * | | | Apply suggestions from code reviewLaurence McGlashan2021-09-141-0/+2
| | | | | | | | | | | | | | | Co-authored-by: Edward Thomson <ethomson@github.com>
| * | | | Refactor shared code in longpath test.Laurence McGlashan2021-09-141-22/+12
| | | | |
| * | | | If longpaths is true and filters are enabled, pass git_repository through ↵Laurence McGlashan2021-09-142-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_remoteEdward Thomson2021-09-202-5/+52
|\ \ \ \ | | | | | | | | | | 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>
| * | | | Update formatting.Laurence McGlashan2021-09-161-3/+3
| | | | |
| * | | | Allow proxy options when connecting with a detached remote.Laurence McGlashan2021-09-162-4/+56
| | | | |
* | | | | Merge pull request #6060 from ccstolley/ccs_merge_bugfixEdward Thomson2021-09-2010-2/+65
|\ \ \ \ \ | | | | | | | | | | | | merge: Check file mode when resolving renames
| * | | | | Add test for revert+rename bug.Colin Stolley2021-09-159-0/+60
| | | | | |
| * | | | | 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 #6050 from shijinglu/patch-1Edward Thomson2021-09-181-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Update README.md
| * | | | Update README.mdshijing2021-09-121-0/+1
| |/ / / | | | | | | | | Add git24j to the language bindings
* | | | Merge pull request #6053 from stac47/ssh2_discoveryEdward Thomson2021-09-142-0/+20
|\ \ \ \ | |_|_|/ |/| | | Discover libssh2 without pkg-config
View Lorry Controller Status