summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| * | | Update src/CMakeLists.txtLaurent Stacul2021-09-141-7/+7
| | | | | | | | | | | | Co-authored-by: Edward Thomson <ethomson@github.com>
| * | | Discover libssh2 without pkg-configLaurent Stacul2021-09-142-0/+20
| |/ /
* | | 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