|
e32db9f2
|
2022-02-27T08:54:09
|
|
cli: always give a value to `error`
|
|
|
1327dbcf
|
2022-02-26T15:10:42
|
|
Merge pull request #6133 from libgit2/ethomson/cli_redux
CLI (redux)
|
|
|
dcabef22
|
2022-02-21T13:06:43
|
|
futils: produce improved error messages
|
|
|
c6dd82d9
|
2020-02-23T11:54:33
|
|
cli: introduce a help command
Add a framework for commands to be defined, and add our first one,
"help". When `git2_cli help` is run, the `cmd_help` function will be
invoked with the remaining command line arguments. This allows users to
invoke `git2_cli help foo` to get information about the `foo` subcommand.
|
|
|
8526cbd5
|
2021-11-26T09:37:29
|
|
opt: use a custom function to print usage
Our argument parser (https://github.com/ethomson/adopt) includes a
function to print a usage message based on the allowed options. Omit
this and use a cutom function that understands that we have subcommands
("checkout", "revert", etc) that each have their own options.
|
|
|
e7be6b76
|
2021-11-29T12:04:06
|
|
futils: provide an option to read a whole file by fd
|
|
|
3a3ab065
|
2020-05-03T23:13:28
|
|
cli: infrastructure for a cli project
Introduce a command-line interface for libgit2. The goal is for it to
be git-compatible.
1. The libgit2 developers can more easily dogfood libgit2 to find bugs,
and performance issues.
2. There is growing usage of libgit2's examples as a client; libgit2's
examples should be exactly that - simple code samples that illustrate
libgit2's usage. This satisfies that need directly.
3. By producing a client ourselves, we can better understand the needs
of client creators, possibly producing a shared "middleware" for
commonly-used pieces of client functionality like interacting with
external tools.
4. Since git is the reference implementation, we may be able to benefit
from git's unit tests, running their test suite against our CLI to
ensure correct behavior.
This commit introduces a simple infrastructure for the CLI.
The CLI is currently links libgit2 statically; this is because the
utility layer is required for libgit2 _but_ shares the error state
handling with libgit2 itself. There's no obviously good solution
here without introducing annoying indirection or more complexity.
Until we can untangle that dependency, this is a good step forward.
In the meantime, we link the libgit2 object files, but we do not include
the (private) libgit2 headers. This constrains the CLI to the public
libgit2 interfaces.
|
|
|
e427d0a1
|
2021-11-30T10:33:24
|
|
cli: add `hash-object` command
Introduce a simple command that emulates `git hash-object`.
|
|
|
b8771227
|
2021-11-28T10:32:03
|
|
cli: add `cat-file` command
Introduce a simple command that emulates `git cat-file`.
|
|
|
f8e7d8fd
|
2021-11-26T17:33:38
|
|
cli: support `help <command>`
Support `help <command>` by re-invoking the command itself with the
`--help` argument. This allows us to keep the help logic with the
commands itself.
|
|
|
d02f4f7a
|
2021-11-17T14:31:29
|
|
cmake: refactor `add_clar_test` into separate module
|
|
|
e6d93612
|
2021-11-16T23:59:43
|
|
refactor: move utility tests into util
|
|
|
2b09b5d7
|
2021-11-16T23:47:14
|
|
refactor: move headertest into separate test folder
|
|
|
25bc84fb
|
2021-11-16T23:41:00
|
|
refactor: move clar into separate directory
|
|
|
3344fddc
|
2021-11-16T23:29:22
|
|
refactor: `tests` is now `tests/libgit2`
Like we want to separate libgit2 and utility source code, we want to
separate libgit2 and utility tests. Start by moving all the tests into
libgit2.
|
|
|
91ba0896
|
2021-11-15T09:54:00
|
|
cmake: rename git2internal target to libgit2
The `git2internal` target is actually the git library; call it such so
that IDE users have visibility into it.
|
|
|
d7b49ed4
|
2021-11-15T14:54:17
|
|
cmake: remove unnecessary xcode hack
|
|
|
5fcfada5
|
2021-11-15T07:45:16
|
|
cmake: document CMakeLists.txt hierarchy
|
|
|
c3b7ace9
|
2021-11-14T16:43:53
|
|
refactor: make util an object library
Instead of simply including the utility files directly, make them a
cmake object library for easy reusability between other projects within
libgit2.
Now the top-level `src` is responsible for platform selection, while the
next-level `libgit2` and `util` configurations are responsible for
identifying what objects they include.
|
|
|
ef4ab298
|
2021-11-14T08:47:40
|
|
refactor: `src` is now `src/libgit2`
|
|
|
49e180c8
|
2022-02-15T22:55:48
|
|
errors: expose `git_error_set`
The `git_error_set` function is useful for callers who implement
backends and advanced callbacks. Expose it.
|
|
|
c716b9f2
|
2022-02-21T10:16:05
|
|
odb: initialize `object` before use
Newer gcc is complaining about `object` being potentially not
initialized; initialize it.
|
|
|
eca9e1cf
|
2022-02-22T07:17:12
|
|
Merge pull request #6228 from libgit2/ethomson/win32_systemdirs
win32: `find_system_dirs` does not return `GIT_ENOTFOUND`
|
|
|
f45121ed
|
2022-02-21T16:13:52
|
|
win32: `find_system_dirs` does not return `GIT_ENOTFOUND`
Allow for no Git for Windows installation. When there is no GfW found
in the path or registry, `git_win32__find_system_dirs` would return a
`GIT_ENOTFOUND`. Callers were not expecting this. Since this is no
error, we simply return `0` so that callers can move on with their
lives.
|
|
|
1551b1f0
|
2022-02-21T09:06:56
|
|
Merge pull request #6226 from libgit2/cmn/update-tips-error
remote: do store the update_tips callback error value
|
|
e35b5e44
|
2022-02-21T10:34:13
|
|
test: add test for the behaviour of update_tips on error
|
|
|
15860aa0
|
2022-02-21T10:03:06
|
|
remote: do store the update_tips callback error value
We use `git_error_set_after_callback_function` to determine whether
`update_tips` returned an error but do not store its return value making us
think it always returns 0.
Fix it by adding the common patter of storing it inside the `if` when calling it.
|
|
|
83f2a20e
|
2022-02-18T09:30:18
|
|
Merge pull request #6220 from libgit2/ethomson/version
meta: update version number to v1.5.0-alpha
|
|
|
899fd4c5
|
2022-02-18T09:30:05
|
|
Merge pull request #6223 from libgit2/ethomson/xdiff
xdiff: use xdl_free not free
|
|
|
1afad26e
|
2022-02-18T08:51:24
|
|
Merge pull request #6219 from apnadkarni/patch-2
Free parent and ref in lg2_commit before returning.
|
|
|
4646f1e3
|
2022-02-18T08:50:53
|
|
Merge pull request #6217 from mgorny/sys-httpparser
cmake: Fix package name for system http-parser
|
|
|
b722c45d
|
2022-02-17T13:55:34
|
|
xdiff: use xdl_free not free
We've added a lovely abstraction layer in xdiff so that it can call our
allocation functions. But it also needs to call our free functions. We
missed some `free` calls in `xmerge.c`. Update them to use `xdl_free`.
Without this, we will pass a pointer allocated with a custom allocator
to the system free function. :bomb:
|
|
b152b030
|
2022-02-14T10:27:48
|
|
meta: document version information for libgit2
|
|
|
056fe4be
|
2022-02-14T07:12:36
|
|
meta: provide an accessor for prerelease info
|
|
|
ae74d5ac
|
2022-02-14T07:01:43
|
|
meta: update version number to v1.5.0-alpha
Update the version number in main to v1.5.0-alpha. This helps people
understand that the main builds are not part of the v1.4.0 release
train.
We use "alpha" to indicate builds out of main (or nightlies) as semver
v2 requires the prerelease component is compared lexicographically.
Thus, our "beta" and "rc" releases should follow.
|
|
aab7c0ba
|
2022-02-14T13:57:07
|
|
Free parent and ref in lg2_commit before returning.
|
|
8bc9eda7
|
2022-02-13T21:23:56
|
|
cmake: Fix package name for system http-parser
Fix building against system http-parser library by fixing
the find_package() argument. It seems to have been accidentally changed
from HTTPParser to HTTP_Parser in de178d36f, effectively making
the build against system library fail to find it:
```
CMake Warning at cmake/SelectHTTPParser.cmake:3 (find_package):
By not providing "FindHTTP_Parser.cmake" in CMAKE_MODULE_PATH this project
has asked CMake to find a package configuration file provided by
"HTTP_Parser", but CMake did not find one.
Could not find a package configuration file provided by "HTTP_Parser" with
any of the following names:
HTTP_ParserConfig.cmake
http_parser-config.cmake
Add the installation prefix of "HTTP_Parser" to CMAKE_PREFIX_PATH or set
"HTTP_Parser_DIR" to a directory containing one of the above files. If
"HTTP_Parser" provides a separate development package or SDK, be sure it
has been installed.
Call Stack (most recent call first):
src/CMakeLists.txt:97 (include)
CMake Error at cmake/SelectHTTPParser.cmake:11 (message):
http-parser support was requested but not found
Call Stack (most recent call first):
src/CMakeLists.txt:97 (include)
```
|
|
|
c8450561
|
2022-02-13T11:55:17
|
|
Merge pull request #6216 from libgit2/ethomson/readme
meta: show build status for v1.3 and v1.4 branches
|
|
|
9c9405df
|
2022-02-13T11:19:39
|
|
meta: show build status for v1.3 and v1.4 branches
|
|
|
1d5b9bd8
|
2022-02-13T11:05:40
|
|
Merge pull request #6214 from libgit2/ethomson/v1.4
libgit2 v1.4
|
|
|
bafd044f
|
2022-02-13T10:07:49
|
|
v1.4: update the changelog
|
|
|
5c949d1f
|
2022-02-13T10:06:15
|
|
v1.4: update version numbers
|
|
|
5f66aa26
|
2022-02-13T09:16:09
|
|
Merge pull request #6212 from apnadkarni/patch-1
Fix crashes in example programs on Windows (sprintf_s not compatible with snprintf)
|
|
|
77ef1a6e
|
2022-02-13T14:11:46
|
|
Update common.h
|
|
|
4c88b9d3
|
2022-02-12T21:29:43
|
|
release.yml: use sentence case for everything
|
|
|
aded938e
|
2022-02-12T21:23:01
|
|
Merge pull request #6204 from boretrk/merge_flags
merge: fix overlap between GIT_MERGE_FILE_FAVOR__CONFLICTED and GIT_MERGE_FILE_SIMPLIFY_ALNUM
|
|
|
d99b4019
|
2022-02-12T14:20:47
|
|
Merge pull request #6211 from libgit2/ethomson/release_config
meta: add a release configuration file
|
|
|
416f7cb3
|
2022-02-12T10:38:08
|
|
Merge pull request #6208 from jorio/fix-stale-filesize-crash
diff_file: fix crash if size of diffed file changes in workdir
|
|
|
e3aad1de
|
2022-02-12T10:27:12
|
|
meta: add a release configuration file
Let's let GitHub handle our release notes as much as possible:
https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
|
|
|
4467bd66
|
2022-02-12T09:09:17
|
|
Merge pull request #6207 from libgit2/ethomson/prng
mktmp: improve our temp file creation
|
|
|
0fbf62cd
|
2022-02-12T08:46:55
|
|
merge: make the internal flags public
We made the flags that enable recursive merge internal, on the
assumption that nobody would want them and they're hard to reason about.
(Giving people an option that nobody wants is just extra noise.)
However, it made it hard for _us_ to reason about. There's no good
reason to keep it private, let's just make it public and push that
cognitive load onto our poor users. But they should expect it, they're
dealing with git, after all.
|
|
|
d2ce981f
|
2022-02-11T17:54:34
|
|
diff: fail generation if a file changes size
When we know that we know a file's size, and the file's size changes,
fail.
|
|
|
359240b6
|
2022-02-11T17:56:05
|
|
diff: indicate when the file size is "valid"
When we know the file size (because we're producing it from a working
directory iterator, or an index with an up-to-date cache) then set a
flag indicating as such. This removes the ambiguity about a 0 file
size, which could indicate that a file exists and is 0 bytes, or that we
haven't read it yet.
|
|
|
e86e81c5
|
2022-02-12T06:58:05
|
|
oid: make empty tree id global
Move the empty tree ID into a global space so that it can be generally
used.
|
|
|
e1415dc3
|
2022-02-11T11:02:00
|
|
diff_file: test empty workdir file grows after obtaining a diff
This test was also provided by @jorio
https://github.com/libgit2/libgit2/pull/6208#issuecomment-1034072050
|
|
9aade20b
|
2022-02-09T19:04:52
|
|
diff_file: test workdir file becomes empty after obtaining a diff
|
|
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>
|
|
|
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.
|
|
|
1d811f0e
|
2022-02-11T07:14:54
|
|
Merge pull request #6203 from libgit2/ethomson/fetch_by_oid
Fetch by object id
|
|
|
3c53796c
|
2022-02-07T19:38:32
|
|
rand: introduce git_rand PRNG
Introduce `git_rand`, a PRNG based on xoroshiro256**, a fast,
all-purpose pseudo-random number generator: https://prng.di.unimi.it
The PRNG will be seeded by the system's entropy store when possible,
falling back to current time and system data (pid, uptime, etc).
Inspiration for this was taken from libressl, but since our PRNG is
not used for cryptographic purposes (and indeed currently only generates
a unique temp file name that is written in a protected directory),
this should be more than sufficient.
Our implementation of xoroshiro256** was taken almost strictly from
the original author's sources, but was tested against PractRand to
ensure that there were no foolish mistranslations:
```
RNG_test using PractRand version 0.94
RNG = RNG_stdin64, seed = unknown
test set = core, folding = standard (64 bit)
rng=RNG_stdin64, seed=unknown
length= 256 megabytes (2^28 bytes), time= 2.9 seconds
no anomalies in 210 test result(s)
rng=RNG_stdin64, seed=unknown
length= 512 megabytes (2^29 bytes), time= 6.2 seconds
no anomalies in 226 test result(s)
rng=RNG_stdin64, seed=unknown
length= 1 gigabyte (2^30 bytes), time= 12.7 seconds
no anomalies in 243 test result(s)
rng=RNG_stdin64, seed=unknown
length= 2 gigabytes (2^31 bytes), time= 25.4 seconds
no anomalies in 261 test result(s)
rng=RNG_stdin64, seed=unknown
length= 4 gigabytes (2^32 bytes), time= 50.6 seconds
no anomalies in 277 test result(s)
rng=RNG_stdin64, seed=unknown
length= 8 gigabytes (2^33 bytes), time= 104 seconds
no anomalies in 294 test result(s)
```
|
|
|
b933c14a
|
2022-02-08T12:22:15
|
|
util: remove `p_mktemp` / `p_mkstemp`
We have our own temporary file creation function now in
`git_futils_mktmp`, remove the others since they may be terrible on some
platforms.
|
|
|
97fade4f
|
2022-02-08T12:19:59
|
|
fs_path: use new mktmp to query unicode support
|
|
|
53063e77
|
2022-02-07T23:11:11
|
|
futils: use our random function for mktemp
`mktemp` on mingw is exceedingly deficient, using a single monotonically
increasing alphabetic character and the pid. We need to use our own
random number generator for temporary filenames.
|
|
|
86c58a5b
|
2022-02-07T23:10:38
|
|
str: add hexadigit encoding to strings
|
|
|
d299a7aa
|
2022-02-08T20:42:45
|
|
Merge pull request #6205 from ccstolley/ccs_fix_http_push_timeout
push: Prepare pack before sending pack header.
|
|
|
1e7c8b1f
|
2022-02-08T20:41:40
|
|
Merge pull request #6206 from libgit2/ethomson/odb_write_failures
odb: check for write failures
|
|
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.
|
|
fed3fef4
|
2022-02-07T00:45:44
|
|
merge: allocate merge flags for internal use
Allocate flags in git_merge_flag_t and git_merge_file_flag_t
for internal usage to prevent accidental double allocation.
|
|
|
caaa1fdf
|
2022-02-07T00:58:38
|
|
merge: change enum GIT_MERGE_FILE_FAVOR__CONFLICTED to flag
GIT_MERGE_FILE__CONFLICTED
This is to avoid a possible problem where the value is set to the
same as GIT_MERGE_FILE_SIMPLIFY_ALNUM in git_merge_file_flag_t
|
|
|
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 '@'
|
|
|
8d967d85
|
2022-02-03T14:25:15
|
|
Merge pull request #6200 from boretrk/c90
C90: add inline macro to xdiff and mbedtls
|
|
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
|
|
|
50fada79
|
2022-01-31T09:22:17
|
|
Merge pull request #6198 from libgit2/ethomson/actions
ci: improve the name in CI runs
|
|
|
6d668ffd
|
2022-01-31T08:35:58
|
|
ci: improve the name in CI runs
|
|
|
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.
|
|
|
46885ac9
|
2022-01-30T21:20:29
|
|
Merge pull request #6153 from arroz/fix/apple-static-lib
Disabling setting `CMAKE_FIND_LIBRARY_SUFFIXES` on Apple platforms.
|
|
|
84e1e560
|
2022-01-30T19:22:38
|
|
Merge branch 'boretrk/futils_mktmp'
|
|
|
4517a48b
|
2022-01-30T19:21:32
|
|
futils: document mktmp's safety
|
|
|
bc746910
|
2022-01-30T18:32:32
|
|
Merge pull request #6185 from boretrk/noext
|
|
|
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.
|