|
0a0cd67d
|
2022-02-08T20:18:15
|
|
diff_file: fix crash if size of diffed file changes in workdir
"diff_file_content_load_workdir_file()" maps a file from the workdir
into memory. It uses git_diff_file.size to determine the size of the
memory mapping.
If this value goes stale, the mmaped area would be sized incorrectly.
This could occur if an external program changes the contents of the
file after libgit2 had cached its size. This used to segfault if the
file becomes smaller (mmaped area too large).
This patch causes diff_file_content_load_workdir_file to fail without
crashing if it detects that the file size has changed.
|
|
3bac68ff
|
2022-02-09T18:54:34
|
|
diff_file: Apply suggestions from code review
Skip new_file_size non-zero test, custom error message if file changed in workdir
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
1d811f0e
|
2022-02-11T07:14:54
|
|
Merge pull request #6203 from libgit2/ethomson/fetch_by_oid
Fetch by object id
|
|
|
d299a7aa
|
2022-02-08T20:42:45
|
|
Merge pull request #6205 from ccstolley/ccs_fix_http_push_timeout
push: Prepare pack before sending pack header.
|
|
aceac672
|
2022-02-08T12:14:50
|
|
Rename prepare_pack() to git_packbuilder__prepare()
|
|
|
91775854
|
2022-02-08T18:04:52
|
|
Update src/pack-objects.h
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
c19a3c7a
|
2022-02-07T11:22:04
|
|
odb: check for write failures
|
|
|
19ec5923
|
2022-02-07T09:29:40
|
|
push: Prepare pack before sending pack header.
For large pushes, preparing the pack can take a while. Currently we
send the pack header first, followed by preparing the pack and then
finally sending the pack. Unfortunately github.com will terminate
a git-receive-pack command over http if it is idle for more than 10
seconds. This is easily exceeded for a large push, and so the push is
rejected with a Broken Pipe error.
This patch moves the pack preparation ahead of sending the pack header,
so that the timeout is avoided.
prepare_pack() can be called multiple times but will only do the work
once, so the original PREPARE_PACK call inside git_packbuilder_foreach()
remains.
|
|
|
d9863fc1
|
2022-02-06T15:27:34
|
|
Merge pull request #6192 from libgit2/ethomson/sha256_preparation
SHA256: early preparation
|
|
|
9d88300a
|
2022-02-05T12:35:46
|
|
fetch: support oids in fetch specs
|
|
|
07264ea7
|
2022-02-06T14:07:36
|
|
fetch: add a test for local fetching
|
|
|
37d98aaf
|
2022-02-06T14:59:24
|
|
transport: transports can indicate support for fetch by oid
|
|
|
7a00adcc
|
2022-02-06T14:58:33
|
|
remote: introduce git_remote_capabilities
Provide a mechanism for (internal) users to determine a remote's
capabilities from the transport.
|
|
|
923c1652
|
2022-02-06T09:36:51
|
|
transport: add capabilities query function
|
|
|
b5237767
|
2022-02-05T10:43:08
|
|
remote: refactor update tips function
Move the functionality to update an individual tip out of the loop;
although the update tip function remains rather gnarly, at least the
outer function is a bit less onerous.
|
|
|
b1e83cca
|
2022-02-05T09:26:54
|
|
remote: refactor ref updating
Pull ref updating into its own function for future uses.
|
|
|
b82d5664
|
2022-02-05T09:03:37
|
|
oid: introduce git_oid__is_hexstr
Introduce a function that determines whether a given string is a valid
object id (40 chars of hexadigits).
|
|
|
4efd6563
|
2022-02-03T16:39:26
|
|
Merge pull request #6196 from libgit2/ethomson/at_revparse
revparse: support bare '@'
|
|
b3384af2
|
2022-02-03T12:27:01
|
|
C90: add inline macro to xdiff and mbedtls
|
|
|
61f1e31a
|
2022-02-02T22:35:18
|
|
Merge pull request #6197 from libgit2/ethomson/merge_msg_conflict_comment
merge: comment conflicts lines in MERGE_MSG
|
|
|
18a477e7
|
2022-02-02T22:35:07
|
|
Merge pull request #6195 from libgit2/ethomson/zdiff3
merge: support zdiff3 conflict styles
|
|
|
c0297d47
|
2022-01-30T22:38:08
|
|
merge: comment conflicts lines in MERGE_MSG
git has started adding comment markers to its conflict lines in
MERGE_MSG. Match that behavior.
|
|
|
add2dabb
|
2022-01-30T22:25:59
|
|
revparse: support bare '@'
A bare '@' revision syntax represents HEAD. Support it as such.
|
|
|
84e1e560
|
2022-01-30T19:22:38
|
|
Merge branch 'boretrk/futils_mktmp'
|
|
|
4517a48b
|
2022-01-30T19:21:32
|
|
futils: document mktmp's safety
|
|
53e8deb9
|
2022-01-23T22:33:37
|
|
Remove stray '// TODO'
|
|
|
34e01bd2
|
2022-01-20T23:07:05
|
|
cmake: disable some gnu extensions
|
|
|
aae54d5b
|
2022-01-30T13:43:43
|
|
Merge pull request #6138 from ccstolley/ccs_packedrefs_fast
refs: Speed up packed lookups.
|
|
|
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.
|
|
|
70d9bfa4
|
2022-01-22T17:34:36
|
|
packbuilder: use the packfile name instead of hash
Deprecate the `git_packfile_hash` function. Callers should use the new
`git_packfile_name` function which provides a unique packfile name.
|
|
|
d2458af7
|
2022-01-22T14:19:13
|
|
indexer: use a byte array for checksum
The index's checksum is not an object ID, so we should not use the
`git_oid` type. Use a byte array for checksum calculation and storage.
Deprecate the `git_indexer_hash` function. Callers should use the new
`git_indexer_name` function which provides a unique packfile name.
|
|
|
11ef76a9
|
2022-01-22T13:31:02
|
|
index: use a byte array for checksum
The index's checksum is not an object ID, so we should not use the
`git_oid` type. Use a byte array for checksum calculation and storage.
Deprecate the `git_index_checksum` function without a replacement. This
is an abstraction that callers should not care about (and indeed do not
seem to be using).
Remove the unused `git_index__changed_relative_to` function.
|
|
|
afca16a7
|
2022-01-22T13:14:59
|
|
config: use a byte array for checksum
|
|
|
c6e1f2bf
|
2022-01-22T11:53:09
|
|
commit_graph: use a byte array for checksum
|
|
|
b7429e1d
|
2022-01-22T09:44:17
|
|
midx: use a byte array for checksum
|
|
|
0e53e55d
|
2022-01-22T14:18:48
|
|
hash: introduce git_hash_fmt
A simple hash-to-hexadigit formatter.
|
|
|
a9fc14b0
|
2022-01-21T19:43:42
|
|
oid: avoid `tostr_s` in many places
The `git_oid_tostr_s` helper is indeed helpful, unless you are using
printf debugging (by inserting more `git_oid_tostr_s` calls) shortly
after using it. Avoid it before invoking complex functions.
|
|
|
50eb7d31
|
2022-01-20T09:09:31
|
|
Merge pull request #6184 from boretrk/noflexarray
diff_driver: split global_drivers array into separate elements
|
|
|
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.
|
|
|
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>
|
|
|
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>
|
|
|
d298059e
|
2022-01-17T21:41:12
|
|
Merge pull request #6167 from libgit2/ethomson/scp_urls_with_ports
Support scp style paths with ports
|
|
|
616628dd
|
2022-01-17T21:39:35
|
|
Merge branch 'main' into typos
|
|
|
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.)
|
|
|
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
|
|
|
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
|
|
|
a979cf3d
|
2021-11-17T22:19:47
|
|
c99: change single bit flags to unsigned
|
|
|
4ac59728
|
2022-01-14T01:54:09
|
|
futils_mktmp: don't use umask.
Previously, we were using `umask(mask = umask(0))` to fetch the current
umask in order to apply it to the desired mode, but this is broken in
the presence of threads. There is no portable way to directly fetch
umask without mutating it.
Instead, add a reimplementation of mkstemp that uses a passed-in mode,
instead of explicitly chmodding to 0600 like POSIX requires of mkstemp.
Fixes: jmgao/pore#46
|
|
|
0a72a3ad
|
2022-01-13T17:43:30
|
|
Fix compiler warning on Windows.
|
|
|
ac07a40a
|
2022-01-12T16:57:51
|
|
Check packed-refs filestamp before reusing mmap.
Avoid using a stale mmap() by tracking the filestamp.
|
|
|
cdf05a1d
|
2022-01-12T16:28:45
|
|
On windows, copy file into memory instead of mmap.
Since mmap() on windows locks the file, and this map is long-lived,
just copy the file into memory instead. This enables us to keep the
lookup() paths the same, while avoiding the downsides of mmap() on
windows.
|
|
|
60faa631
|
2022-01-13T17:32:48
|
|
Drop redundant check in packed_set_peeling_mode().
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
d86b9f79
|
2022-01-13T17:23:01
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
678c9ddf
|
2022-01-13T17:22:13
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
b162bb35
|
2022-01-13T17:20:53
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
c55275ff
|
2022-01-13T17:20:47
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
620e3abc
|
2022-01-13T17:20:27
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
99fc3d49
|
2022-01-13T17:20:20
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
c6c6c0bd
|
2022-01-13T17:20:14
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
d89f1fe5
|
2022-01-13T17:20:09
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
a0381cf2
|
2022-01-13T17:20:04
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
10abd7bc
|
2022-01-13T17:19:57
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
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.
|
|
|
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.
|
|
|
ca9f6b98
|
2022-01-06T07:41:27
|
|
Merge remote-tracking branch 'pr/6159'
|
|
|
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
|
|
|
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`.
|
|
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`.
|
|
|
207840d8
|
2021-12-24T10:48:02
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
2ec7b291
|
2021-12-24T10:47:53
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
2b722da4
|
2021-12-24T10:47:43
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
0df53fd6
|
2021-12-24T10:47:32
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
3f52f7b9
|
2021-12-24T10:47:22
|
|
Update src/refdb_fs.c
Co-authored-by: Edward Thomson <ethomson@github.com>
|
|
|
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.
|
|
|
942cfac1
|
2021-12-23T14:21:23
|
|
worktree: checkout options suggestions from code review
|
|
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
|