|
c629d2a1
|
2022-01-29T21:02:15
|
|
merge: support zdiff3 conflict styles
|
|
|
1458fb56
|
2022-01-29T07:18:26
|
|
xdiff: include new xdiff from git
Update to the xdiff used in git v2.35.0, with updates to our build
configuration to ignore the sort of warnings that we normally care
about (signed/unsigned mismatch, unused, etc.)
Any git-specific abstraction bits are now redefined for our use in
`git-xdiff.h`. It is a (wildly optimistic) hope that we can use that
indirection layer to standardize on a shared xdiff implementation.
|
|
|
12c2eef7
|
2022-01-27T17:40:54
|
|
Merge pull request #6187 from libgit2/ethomson/copyright
COPYING: remove regex copyright, add PCRE copyright
|
|
|
f2faa01c
|
2022-01-22T19:24:18
|
|
COPYING: remove regex copyright, add PCRE copyright
We now bundle PCRE for our regular expression implementation; include
that copyright notice and remove the now-unused regular expression
copyright.
|
|
|
50eb7d31
|
2022-01-20T09:09:31
|
|
Merge pull request #6184 from boretrk/noflexarray
diff_driver: split global_drivers array into separate elements
|
|
|
4fead636
|
2022-01-19T19:15:29
|
|
Merge pull request #6180 from libgit2/ethomson/win32_findfile_fixes
win32: update git for windows compatibility
|
|
5388e0c1
|
2021-11-23T00:00:32
|
|
diff_driver: split global_drivers array into separate elements
C99 doesn't allow structures with flexible length array to be
placed in an array.
|
|
|
258df9c1
|
2022-01-17T22:03:26
|
|
Merge pull request #6168 from punkymaniac/patch-documentation-2
Improve documentation
|
|
f64568eb
|
2019-06-28T16:49:58
|
|
Do not unconditionally remove the last 4 chars of the directory where git.exe was found
Removal of the last 4 chars is only required for Git for Windows installations in order to find the "root" folder of the Git installation.
Fixes issue #5127.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
7707caaf
|
2019-06-28T16:42:21
|
|
Prevent possible buffer overflow
Could happen if the path to git.exe is near to MAX_PATH and we append a longer subdir such as "share/git-core" to it.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
475c6eba
|
2022-01-17T17:16:02
|
|
win32: improve impl & tests for system path / g4w interop
We look for a Git for Windows installation to use its git config,
so that clients built on libgit2 can interoperate with the Git for
Windows CLI (and clients that are built on top of _it_).
Look for `git` both in the `PATH` and in the registry. Use the _first_
git install in the path, and the first git install in the registry.
Look in both the `etc` dir and the architecture-specific `etc` dirs
(`mingw64/etc` and `mingw32/etc`) beneath the installation root.
Prefer the git in the `PATH` to the git location in the registry so that
users can override that.
Include more tests for this behavior.
|
|
|
925abee9
|
2022-01-15T20:08:10
|
|
path: introduce git_fs_path_find_executable
Provide a helper function to find an executable in the current process's
PATH.
|
|
|
29960649
|
2022-01-15T14:13:53
|
|
win32: remove unnecessary findfile structure
|
|
|
ecbb01f5
|
2022-01-17T00:09:13
|
|
win32: test system paths for gvfs compatibility
|
|
|
796fa0dd
|
2022-01-16T20:19:07
|
|
sysdir: allow resetting cached system dirs
|
|
|
7fd5dfa0
|
2021-12-25T15:25:15
|
|
Correctly detect the share/template folder
With Git for Windows >= 2 the share folder is in an architecture specific subfolder.
This also add support for Git for Windows versions between 2 and 2.24 where also the etc folder is in an architecture specific subfolder.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
f3c1bedf
|
2019-06-28T17:05:57
|
|
Detect installed x64 versions of Git for Windows
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
d298059e
|
2022-01-17T21:41:12
|
|
Merge pull request #6167 from libgit2/ethomson/scp_urls_with_ports
Support scp style paths with ports
|
|
|
d50b3464
|
2022-01-17T21:39:43
|
|
Merge pull request #6164 from rex4539/typos
Fix typos
|
|
|
616628dd
|
2022-01-17T21:39:35
|
|
Merge branch 'main' into typos
|
|
d4232e7c
|
2022-01-17T21:21:54
|
|
Apply suggestions from code review
|
|
|
27307ed6
|
2022-01-11T10:39:57
|
|
ssh: use url parsing functionality
Instead of trying to figure out a repo's path from a URL by hand, parse
a URL using the parsing functionality.
|
|
|
e02e6a5c
|
2022-01-11T10:19:40
|
|
url: introduce git_net_str_is_url
We occasionally need to determine whether a given string is a URL or
something else. (The "something else" may be a git path in a different
format, like scp formatting, which needs to be handled differently.)
|
|
|
69134223
|
2022-01-10T21:14:40
|
|
ci: test `[user@host:port]:path` formats
|
|
|
e2bda60a
|
2022-01-10T21:12:13
|
|
url: introduce git_net_url_parse_scp
Provide a mechanism for parsing scp-style paths (eg
`git@github.com:libgit2/libgit2` into the url form
`ssh://git@github.com/libgit2/libgit2`.)
|
|
|
3db53eb1
|
2022-01-10T21:10:49
|
|
common: update the error checking macros
|
|
|
df4448f2
|
2022-01-10T21:25:05
|
|
online: test with https instead of git protocol
GitHub is removing support for the unauthenticated git protocol; test
with the https protocol.
|
|
|
2bfd8ddc
|
2022-01-17T21:05:17
|
|
Merge pull request #6175 from libgit2/ethomson/follow_redirects_initial
remote: support `http.followRedirects` (`false` and `initial`) and follow initial redirects by default
|
|
|
6723edc7
|
2022-01-17T19:36:53
|
|
Merge pull request #6179 from boretrk/flags
c99: change single bit flags to unsigned
|
|
|
a979cf3d
|
2021-11-17T22:19:47
|
|
c99: change single bit flags to unsigned
|
|
|
f4fec251
|
2022-01-13T16:54:56
|
|
ci: minor formatting cleanups to test output
|
|
|
adaa037d
|
2022-01-04T16:18:40
|
|
remote: test honoring configuration option
Test that we honor `http.followRedirects` when set to initial or false.
|
|
|
fda59a76
|
2022-01-04T07:05:20
|
|
remote: honor `http.followRedirects` configuration option
|
|
|
515daeaf
|
2022-01-04T06:16:30
|
|
remote: introduce `follow_redirects` connect option
Give callers the ability to select how to handle redirects - either
supporting redirects during the initial connection (so that, for
example, `git.example.com/repo` can redirect to `github.com/example/repo`)
or all/no redirects. This is for compatibility with git.
|
|
|
342e55ac
|
2021-12-18T10:13:18
|
|
url: optionally allow off-site redirects
In redirect application logic, (optionally) allow off-site redirects.
|
|
|
c104a565
|
2022-01-06T07:56:32
|
|
ci: stop retrying "flaky" tests
We (thankfully) don't have flaky tests anymore, don't retry them.
|
|
|
cd261af2
|
2021-12-18T07:42:44
|
|
ci: use poxygit v0.5.1
The new version of our test git server adds redirect support. Upgrade
to it.
|
|
7491b3fd
|
2022-01-12T09:38:09
|
|
Set parameter name as function declaration
|
|
|
4e93ecfa
|
2022-01-11T15:06:00
|
|
Separate function description from short description
|
|
|
5c8f7a99
|
2022-01-09T10:41:24
|
|
Rephrase param description
|
|
|
c6ede676
|
2022-01-09T10:35:42
|
|
Fix misspelling word "ge" -> "get"
|
|
|
58ae4535
|
2022-01-09T10:29:00
|
|
Document return value for git_libgit2_features
|
|
|
68bc511a
|
2021-11-26T15:14:56
|
|
Add documentation about parameter and return value
|
|
|
03aed8bc
|
2021-11-26T14:57:41
|
|
Add missing parameter name
|
|
|
f8b26df3
|
2021-11-26T12:50:40
|
|
Add `git_apply_options_init` documentation
|
|
|
6fc6eeb6
|
2021-12-24T15:14:38
|
|
remote: introduce `git_remote_connect_options`
The existing mechanism for providing options to remote fetch/push calls,
and subsequently to transports, is unsatisfactory. It requires an
options structure to avoid breaking the API and callback signatures.
1. Introduce `git_remote_connect_options` to satisfy those needs.
2. Add a new remote connection API, `git_remote_connect_ext` that will
take this new options structure. Existing `git_remote_connect` calls
will proxy to that. `git_remote_fetch` and `git_remote_push` will
proxy their fetch/push options to that as well.
3. Define the interaction between `git_remote_connect` and fetch/push.
Connect _may_ be called before fetch/push, but _need not_ be. The
semantics of which options would be used for these operations was
not specified if you specify options for both connect _and_ fetch.
Now these are defined that the fetch or push options will be used
_if_ they were specified. Otherwise, the connect options will be
used if they were specified. Otherwise, the library's defaults will
be used.
4. Update the transports to understand `git_remote_connect_options`.
This is a breaking change to the systems API.
|
|
|
f99a0d69
|
2022-01-04T15:17:01
|
|
remote: improved error reporting
Several places in the remote code identify an error and then swallow it;
return the error.
|
|
|
f5373123
|
2021-12-24T15:17:52
|
|
push: don't try to connect in `finish`
Push starts by connecting, don't try to connect again, just rely on the
existing connection existing.
|
|
|
240c195f
|
2022-01-02T08:19:45
|
|
docs: document our API/ABI stability stance
|
|
|
e2e3f3e4
|
2022-01-06T07:42:36
|
|
Merge branch 'status'
|
|
|
9faa9199
|
2022-01-06T07:42:01
|
|
status: don't use `// ...` in tests, use `/* ... */`
|
|
|
ca9f6b98
|
2022-01-06T07:41:27
|
|
Merge remote-tracking branch 'pr/6159'
|
|
|
da5385c6
|
2022-01-06T07:39:21
|
|
status: don't use `// ...` in tests, use `/* ... */`
|
|
|
db3572b7
|
2022-01-06T07:38:07
|
|
Merge pull request #6165 from libgit2/ethomson/includeif
config: handle empty conditional in includeIf
|
|
90df4302
|
2022-01-05T12:18:05
|
|
Fix typos
|
|
|
0bf67234
|
2022-01-05T09:30:27
|
|
Merge pull request #6158 from arroz/feat/statusRenameThreshold
Add `rename_threshold` to `git_status_options`.
|
|
|
715bfe10
|
2022-01-05T09:22:38
|
|
config: test allocation in config conditionals
|
|
|
83a1e614
|
2022-01-05T09:18:59
|
|
config: handle empty conditional in includeIf
When a config file contains `[includeIf]` (with no condition), we should
treat that as a falsey value. This means that we should properly parse
a config value of `includeIf.path`.
|
|
|
82f526a9
|
2022-01-04T22:46:10
|
|
Merge pull request #6157 from boretrk/hmac_ctx_cleanup
ntmlclient: fix linking with libressl
|
|
a3436cde
|
2022-01-01T15:17:08
|
|
#6154 git_status_list_new case insensitive fix
|
|
|
ef848891
|
2021-12-31T16:40:58
|
|
Add `rename_threshold` to `git_status_options`.
|
|
|
6aa3603a
|
2021-12-31T01:50:45
|
|
ntmlclient: don't declare dummy HMAC_CTX_cleanup when building with libressl
|
|
|
50b4d53e
|
2021-12-24T08:01:57
|
|
Merge pull request #6150 from cestrand/patch-1
Remove PSGit from Language Bindings section of README
|
|
85442950
|
2021-12-24T14:24:07
|
|
Remove PSGit from Language Bindings section of README
PSGit is not using libgit2 library. It is stub of a library and is not developed further.
|
|
|
00346ce8
|
2021-12-24T00:12:59
|
|
Merge pull request #6148 from libgit2/ethomson/ci
ci: build with ssh on nightly
|
|
|
c940b695
|
2021-12-23T22:33:32
|
|
ci: build with ssh on nightly
|
|
|
153f6c27
|
2021-12-23T22:02:11
|
|
Merge pull request #6147 from libgit2/ethomson/insteadof
remote: refactor insteadof application
|
|
|
33d0ad9c
|
2021-12-23T21:18:54
|
|
remote: refactor insteadof application
Using the insteadof helper would leak memory when we didn't really want
the pushInsteadOf configuration. Refactor the choice into the function
that allocates memory (or now, not) and use a more idiomatic `int`
return code.
|
|
|
86e5003d
|
2021-12-23T14:22:34
|
|
Merge branch 'pr/6062'
|
|
|
942cfac1
|
2021-12-23T14:21:23
|
|
worktree: checkout options suggestions from code review
|
|
|
f9a98f94
|
2021-11-22T15:16:26
|
|
Fix test fail because of memory leak
|
|
|
1fa8014a
|
2021-11-22T12:07:59
|
|
Update test for `git_str` usage instead of `git_buf`
See commit f0e693b18afbe1de37d7da5b5a8967b6c87d8e53
|
|
|
8b0ffdcb
|
2021-11-08T17:23:27
|
|
Add test for `git_worktree_add` no checkout
|
|
|
58451759
|
2021-10-14T09:55:00
|
|
Change default checkout strategy from FORCE to SAFE
Since we are able to give our own git checkout options,
the default git checkout strategy will be the same as
initialized in a new git_checkout_options struct.
|
|
|
ffead012
|
2021-09-09T18:02:22
|
|
Allow user checkout options on git_worktree_add
Extend the `git_worktree_add_options` to include `git_checkout_options`.
github issue #5949
|
|
|
a50bbba1
|
2021-12-23T15:07:29
|
|
Merge pull request #6142 from libgit2/ethomson/blob_data_is_binary
blob: identify binary content
|
|
|
05c3d972
|
2021-12-23T15:03:08
|
|
Merge pull request #6124 from csware/config-parsing
Config parsing
|
|
|
3cca14b3
|
2021-12-23T14:13:34
|
|
Merge pull request #6125 from stforek/git_commit_summary_spaces
git_commit_summary: ignore lines with spaces
|
|
|
dca31d24
|
2021-12-23T14:12:23
|
|
Merge pull request #6101 from mkhl/fix/instead-of
remotes: fix insteadOf/pushInsteadOf handling
|
|
|
ab5b3f37
|
2021-12-23T14:09:09
|
|
Merge pull request #6095 from yoichi/better-compatiblity-for-at-time-notation
Better revparse compatibility for at time notation
|
|
|
4b27009c
|
2021-12-23T14:04:43
|
|
Merge pull request #6094 from visualgitio/commit-graph-long-long
Fix a long long that crept past
|
|
|
734468d6
|
2021-12-23T14:02:02
|
|
Merge pull request #6146 from Qix-/main
cmake: use project-specific root variable instead of CMAKE_SOURCE_DIR
|
|
c5cd71b2
|
2021-12-23T18:23:34
|
|
cmake: use PROJECT_SOURCE_DIR of CMAKE_SOURCE_DIR
Also applies to *_BINARY_DIR.
This effectively reverts 84083dcc8bd41332ccac9d7b537f3e254d79011c,
which broke all users of libgit2 that use it as a CMake subdirectory
(via `add_subdirectory()`). This is because CMAKE_SOURCE_DIR refers
to the root-most CMake directory, which in the case of
`add_subdirectory()` is a parent project to libgit2 and thus the paths
don't make any sense to the configuration files. Corollary,
CMAKE_SOURCE_DIR only makes sense if the CMake project is always the
root project - which can rarely be guaranteed.
In all honesty, CMake should deprecate and eventually remove
CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR. It's been the source of headaches
and confusion for years, they're rarely useful over
CMAKE_CURRENT_(SOURCE|BINARY)_DIR or PROJECT_(SOURCE|BINARY)_DIR,
and they cause a lot of confusing configuration and source
code layouts to boot.
Any time they are used, they break `add_subdirectory()` almost 100% of
the time, cause confusing error messages, and hide subtle bugs.
|
|
5761980d
|
2021-12-11T22:33:16
|
|
Simplifications to definitions to avoid UINT64_C
|
|
|
4591e76a
|
2021-12-10T15:19:59
|
|
blob: identify binary content
Introduce `git_blob_data_is_binary` to examine a blob's data, instead of
the blob itself. A replacement for `git_buf_is_binary`.
|
|
|
dff05bc3
|
2021-11-25T11:40:20
|
|
Multiline config values not preserved on saving
(fixes issue #6088)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
854164a5
|
2021-11-25T11:02:41
|
|
Add more tests for contents
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
433edb54
|
2021-11-25T10:22:22
|
|
Config parsing confused by continuations that start with quotes
(fixes issue #6089)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
|
|
|
12b53eb0
|
2021-12-04T20:00:41
|
|
Merge pull request #6128 from libgit2/ethomson/object_validation
Introduce `git_object_rawcontent_is_valid`
|
|
|
9f03ebd1
|
2021-11-29T13:44:42
|
|
object: introduce a raw content validation function
Users may want to validate raw object content; provide them a function
to do so.
|
|
|
fc1a3f45
|
2021-11-29T13:36:36
|
|
object: return GIT_EINVALID on parse errors
Return `GIT_EINVALID` on parse errors so that direct callers of parse
functions can determine when there was a failure to parse the object.
The object parser functions will swallow this error code to prevent it
from propagating down the chain to end-users. (`git_merge` should not
return `GIT_EINVALID` when a commit it tries to look up is not valid,
this would be too vague to be useful.)
The only public function that this affects is
`git_signature_from_buffer`, which is now documented as returning
`GIT_EINVALID` when appropriate.
|
|
|
6fdb1b2f
|
2021-11-30T21:09:57
|
|
Merge pull request #6122 from libgit2/ethomson/cleanup
Minor code cleanups
|
|
1e015088
|
2021-11-25T15:19:17
|
|
git_commit_summary: ignore lines with spaces
Fixes libgit2/libgit2#6065
|
|
7bb206a7
|
2021-11-23T10:12:29
|
|
Merge branch 'main' into better-compatiblity-for-at-time-notation
Conflicts:
src/revparse.c
|
|
|
f9c4dc10
|
2021-11-22T11:23:50
|
|
Merge pull request #6106 from ammgws/fixtemplateerr
Fix repo init when template dir is non-existent
|
|
|
3461aaf7
|
2021-11-22T10:29:29
|
|
repo: minor formatting fix
|
|
|
84083dcc
|
2021-11-19T08:48:08
|
|
cmake: use CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR
Instead of using the project-specific `libgit2_SOURCE_DIR` and
`libgit2_BINARY_DIR` variables, use `CMAKE_SOURCE_DIR` and
`CMAKE_BINARY_DIR`.
|
|
|
adcf638c
|
2021-11-21T21:34:17
|
|
filebuf: use hashes not oids
The filebuf functions should use hashes directly, not indirectly
using the oid functions.
|
|
|
91365fd8
|
2021-11-22T09:02:38
|
|
sha1: tests should use hashes, not oid computation
The tests that examine sha1 behavior (including collision detection)
should test against the hash functionality directly, not indirectly
using the oid functions.
|
|
|
fc42c28e
|
2021-11-19T09:36:03
|
|
util: don't include unnecessary system libraries
Remove some unnecessary includes from utility code.
|