Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cbartschat merge2 #45

Open
wants to merge 822 commits into
base: main
Choose a base branch
from
Open

Cbartschat merge2 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
822 commits
Select commit Hold shift + click to select a range
517d2cd
Merge pull request #6697 from libgit2/ethomson/ci
ethomson Dec 21, 2023
198a1b2
Merge pull request #5904 from pluehne/support-authentication-in-push-…
ethomson Dec 21, 2023
e2027c0
ci: add noble to build-container matrix
ethomson Dec 23, 2023
0572884
commit: introduce `git_repository_commit_parents`
ethomson Dec 22, 2023
98075ba
fixup! commit: introduce `git_repository_commit_parents`
ethomson Dec 23, 2023
0589ba6
ci: use newest libssh2 in bionic builds
ethomson Jan 10, 2024
235f8e2
ci: update nightlies
ethomson Dec 23, 2023
ee1d9a0
ci: actually push new build containers
ethomson Dec 23, 2023
d15be59
ci: move docker container creation to an action
ethomson Dec 23, 2023
5d60731
Merge pull request #6709 from libgit2/ethomson/nightly
ethomson Jan 10, 2024
ea00310
Merge pull request #6707 from libgit2/ethomson/commit
ethomson Jan 10, 2024
d6454dd
docs: fix mistake in attr.h
DavHau Jan 11, 2024
ef53f20
Merge pull request #6714 from DavHau/fixes
ethomson Jan 11, 2024
45c8caa
benchmarks: update name to be "libgit2"
ethomson Jan 7, 2024
155eb67
benchmarks: use upload-artifact v3
ethomson Jan 7, 2024
a79e48a
benchmarks: publish benchmarks as a static api
ethomson Jan 11, 2024
ff58b16
Merge pull request #6715 from libgit2/ethomson/benchmarks
ethomson Jan 12, 2024
516749f
repo: simplify safe.directory comparison
ethomson Jan 14, 2024
25e2b9d
Merge branch 'safedir'
ethomson Jan 14, 2024
048421a
repo: add `head_commit` helper
ethomson Jan 14, 2024
cf19ddc
commit: fix const declaration
ethomson Jan 14, 2024
fddfca3
tests: add `cl_assert_equal_oidstr` helper method
ethomson Jan 15, 2024
67a4d04
commit: introduce `git_commit_create_from_stage`
ethomson Jan 15, 2024
5538181
commit: support specifying encoding for message
ethomson Jan 15, 2024
216f698
merge: fix incorrect rename detection for empty files.
herrerog Jan 15, 2024
334dd8d
tests: merge: tree: add support for different ancestor.
herrerog Jan 15, 2024
16688ef
tests: merge: tree: detect incorrect renames.
herrerog Jan 15, 2024
392e380
set SSH timeout
vafada Jan 19, 2024
7f1d520
config: properly rename section containing multivars
samueltardieu Jan 22, 2024
9b2577f
Merge pull request #6716 from libgit2/ethomson/commit
ethomson Jan 26, 2024
7be7c0c
use git_socket_stream__timeout
vafada Jan 26, 2024
ca864c5
clone: don't swallow error in should_checkout
ethomson Feb 4, 2024
f6d1cd7
Merge pull request #6727 from libgit2/ethomson/should_checkout_error
ethomson Feb 4, 2024
c3dc87b
docs: update documentation for timeout
ethomson Feb 5, 2024
802f08c
Merge pull request #6721 from vafada/ssh-timeout
ethomson Feb 5, 2024
8bd6957
fuzzers: provide util functions like repo init
ethomson Nov 17, 2023
f015996
fuzzer: add a revparse fuzzer
ethomson Nov 17, 2023
cef060a
fuzzer: run address sanitization during fuzzing
ethomson Nov 17, 2023
d41d321
transport: safely handle messages with no caps
ethomson Nov 17, 2023
d353cf4
revparse: fix parsing bug for trailing `@`
ethomson Nov 17, 2023
56c98a0
index: test adding two identical slash-prefix paths
ethomson Dec 16, 2023
18ea0b0
index: correct index has_dir_name check
ethomson Dec 16, 2023
b4263c2
Merge remote-tracking branch 'origin/main' into push-options
ethomson Feb 6, 2024
3966995
push: "push_options" are now "remote_push_options"
ethomson Feb 5, 2024
85279f0
ci: update push options tests
ethomson Feb 5, 2024
cbff31d
Merge pull request #6729 from libgit2/ethomson/index_add
ethomson Feb 6, 2024
5f9e67a
Merge pull request #6730 from libgit2/ethomson/revparse
ethomson Feb 6, 2024
8535fdb
Merge pull request #6439 from russell/push-options
ethomson Feb 7, 2024
00eb347
ci: add fedora container and build
sergio-correia Jan 16, 2024
06e384a
Enable llhttp for HTTP parsing
sgallagher Jan 10, 2024
c95e91a
GIT_RAND_GETENTROPY: do not include sys/random.h
semarie Feb 12, 2024
38a062d
Support index.skipHash true config
parnic Feb 16, 2024
9ed0147
Add index.skipHash test
parnic Feb 16, 2024
e159f5a
Remove unnecessary files
parnic Feb 16, 2024
b630c7d
Merge pull request #6736 from semarie/getentropy
ethomson Feb 17, 2024
d730787
Update src/libgit2/index.c
parnic Feb 17, 2024
b69d927
Update src/libgit2/index.c
parnic Feb 17, 2024
6a218c2
Update tests/libgit2/status/worktree.c
parnic Feb 17, 2024
a0dbf60
Change capitalization per PR feedback
parnic Feb 17, 2024
e696528
Update cmake/SelectHTTPSBackend.cmake
ethomson Feb 17, 2024
bfe0ac7
Merge pull request #6631 from chris-forks/add-dl
ethomson Feb 17, 2024
68bc350
Merge branch 'libgit2:main' into support-index.SkipHash
parnic Feb 17, 2024
8422a63
config: avoid unnecessary copy in rename_section
ethomson Feb 17, 2024
913d4ea
skiphash: free the index
ethomson Feb 17, 2024
796191d
Merge pull request #6738 from parnic/support-index.SkipHash
ethomson Feb 17, 2024
9e4e930
Merge pull request #6723 from samueltardieu/config-rename-multivar
ethomson Feb 17, 2024
928ac17
meta: add dependency tag to release.yml
ethomson Feb 18, 2024
c2247bf
Merge pull request #6740 from libgit2/ethomson/release_yaml
ethomson Feb 18, 2024
49487b5
clar: canonicalize temp sandbox directory everywhere
ethomson Feb 19, 2024
bec1d7b
path: provide a helper to compute len with trailing slashes
ethomson Feb 18, 2024
beea99b
path: provide an is_root helper method
ethomson Feb 18, 2024
f43aa1a
util: move path tests to path::core
ethomson Feb 19, 2024
bdf4d70
util: update win32 p_realpath to canonicalize case
ethomson Feb 19, 2024
57870e9
util: clean up test resources in the sandbox
ethomson Feb 19, 2024
19d5283
repo: trim trailing slashes from safedir error message
ethomson Feb 18, 2024
d970934
repo: test that '%(prefix)/' safe.directory succeeds
ethomson Feb 18, 2024
7130954
repo: trim '%(prefix)/' from safedir on all platforms
ethomson Feb 18, 2024
b19a6a1
repo: refactor safe directory tests
ethomson Feb 18, 2024
c1734b5
repo: test for safe.directory with unc paths
ethomson Feb 18, 2024
e9d5521
repo: handle root paths properly for safe directories
ethomson Feb 18, 2024
9c31bd0
repo: allow safe.directory to be a UNC path
ethomson Feb 19, 2024
c63eccc
revparse: ensure bare '@' is truly bare
ethomson Feb 20, 2024
af68b86
revspec: correct capitalization for error message
ethomson Feb 20, 2024
6e8c09a
repo: ensure we can initialize win32 paths
ethomson Feb 20, 2024
ca08e89
Merge pull request #6742 from libgit2/ethomson/revspec
ethomson Feb 20, 2024
8c9ebf4
Merge pull request #6743 from libgit2/ethomson/repo_init_win32
ethomson Feb 20, 2024
2b1d892
Merge pull request #6240 from xphoniex/xphoniex/swap-add-del-eof-nl
ethomson Feb 20, 2024
267479d
http: support empty http.proxy config setting
ethomson Feb 20, 2024
4a1c2bd
diff: fix test for SHA256 support in diff_from_buffer
ethomson Feb 20, 2024
8adf558
Merge pull request #6745 from libgit2/ethomson/diff_fix
ethomson Feb 20, 2024
d30692d
Merge pull request #6744 from libgit2/ethomson/http_proxy
ethomson Feb 20, 2024
6b54210
merge: refactor merge tests for empty files treated as renames
ethomson Feb 20, 2024
a204533
test: completely ignored diff is empty
ethomson Feb 20, 2024
d704046
diff: don't print header for empty (fully ignored) diff
ethomson Feb 20, 2024
caf1747
Merge pull request #6739 from libgit2/ethomson/safedirectory
ethomson Feb 20, 2024
e62cdc9
Merge pull request #6717 from herrerog/fix-rename-detection
ethomson Feb 20, 2024
aa31120
config: introduce GIT_CONFIG_LEVEL_WORKTREE
vermiculus Feb 6, 2022
c4df102
config: load worktree config from disk
vermiculus Feb 6, 2022
5a86dfc
repository: support the 'worktreeConfig' extension
vermiculus Feb 6, 2022
42e7e68
config: refactor get_backend_for_use
vermiculus Feb 21, 2024
ea66ab0
config: skip worktree config in get_backend_for_use
vermiculus Feb 21, 2024
9b21c42
config: return only backends that contain the key
vermiculus Feb 21, 2024
498f443
config: normalize key name in get_backend_for_use
vermiculus Feb 21, 2024
47f3953
config: use appropriate backend_use value
vermiculus Feb 21, 2024
4cd2d17
config: propagate errors from get_backend_for_use
vermiculus Feb 21, 2024
8fd4f83
Merge pull request #5893 from libgit2/ethomson/diff_fail
ethomson Feb 22, 2024
88608a5
worktree: update worktree refs test
ethomson Feb 22, 2024
bd242a0
Fix broken links
csware Feb 24, 2024
f9e0554
Fix memory leaks
csware Feb 24, 2024
2f6c4f7
Fix broken regexp that matches submodule names containing ".path"
csware Feb 24, 2024
99018a0
Merge pull request #6749 from csware/submodule-path-regexp
ethomson Feb 24, 2024
4ab9c40
Merge pull request #6748 from csware/fix-memleaks
ethomson Feb 28, 2024
cc35d98
ci: drop debugging ls
ethomson Feb 29, 2024
1a3d6a8
ci: allow opting out of push-options tests
ethomson Feb 29, 2024
038f078
ci: disable push options tests on older systems
ethomson Feb 29, 2024
54bfab9
Merge pull request #6751 from libgit2/ethomson/ci
ethomson Feb 29, 2024
6c7df67
Consistently use libgit2.org
csware Mar 1, 2024
70ab821
config: improve documentation for config levels
ethomson Mar 2, 2024
78f1453
config: update tests to use `fail_with`
ethomson Mar 2, 2024
88b5167
trace: Re-enable tests as tracing is now enabled by default
lrm29 Mar 4, 2024
74ce864
Merge pull request #6752 from lrm29/patch-1
ethomson Mar 5, 2024
885744a
worktree: keep version number at 1
ethomson Mar 5, 2024
85f5aec
Merge remote-tracking branch 'origin/main' into worktree
ethomson Mar 5, 2024
d6f0856
Merge branch 'worktree'
ethomson Mar 5, 2024
8fc7798
Merge pull request #6747 from csware/doc-links
ethomson Mar 8, 2024
7bbb07f
worktree: dry up the refdb_fs iterator
ethomson Mar 8, 2024
9baf618
Merge remote-tracking branch 'origin/main' into worktree_refs
ethomson Mar 8, 2024
d7336ae
Merge branch 'worktree_refs'
ethomson Mar 8, 2024
c95e8e3
Merge pull request #6359 from albfan/fix-log-example
ethomson Mar 9, 2024
b499a34
config: introduce a writers list
ethomson Mar 3, 2024
fb187bd
config: return GIT_EREADONLY on read-only configs
ethomson Mar 4, 2024
5f85714
config: don't git_config_free an aborted transaction
ethomson Mar 4, 2024
d287e1a
config: store the backend in a transaction
ethomson Mar 4, 2024
e8910c1
config: refcount the backend when we start a transaction
ethomson Mar 4, 2024
e890ca3
config: only read worktree config if extension is set
ethomson Mar 11, 2024
3baa637
config: read the individual worktree config
ethomson Mar 11, 2024
b454eba
errors: introduce GIT_ENOTSUPPORTED
ethomson Mar 11, 2024
b8f3dae
fetch: fail on depth for local transport
ethomson Mar 11, 2024
bad5620
Merge pull request #6757 from libgit2/ethomson/local_depth
ethomson Mar 11, 2024
cb4b617
Merge branch 'main' into ethomson/worktree-config
ethomson Mar 11, 2024
2625ed2
Initial implementation.
adamharrison Mar 13, 2024
5934779
Restored verify result report.
adamharrison Mar 13, 2024
fdaf373
trailer: test actual array equivalence
ethomson Mar 14, 2024
d488817
trailer: ensure we identify patch lines like git
ethomson Mar 14, 2024
4c93532
tests: don't free an unininitialized repo
ethomson Mar 14, 2024
8f33d0e
Merge pull request #6763 from libgit2/ethomson/oops
ethomson Mar 16, 2024
e3d1145
Merge pull request #6761 from libgit2/ethomson/message_trailer
ethomson Mar 16, 2024
53978e6
ci: reduce ASLR randomization for TSAN
ethomson Mar 16, 2024
ea5e999
Merge pull request #6764 from libgit2/ethomson/cifix
ethomson Mar 16, 2024
b70dd12
packbuilder: adjust nondeterministic tests
ethomson Mar 14, 2024
844e7b3
Merge pull request #6762 from libgit2/ethomson/zlib
ethomson Mar 16, 2024
5940639
cli: use libgit2 system includes
ethomson Mar 16, 2024
0798617
build: update ntlmclient dependency
ethomson Mar 16, 2024
3266fc4
mbedtls: keep track of what we allocate, then free it
ethomson Mar 16, 2024
c2ed49c
Merge pull request #6756 from libgit2/ethomson/worktree-config
ethomson Mar 16, 2024
47b7d72
Merge pull request #6759 from adamharrison/PR/mbedtls3
ethomson Mar 16, 2024
58dfe64
build: update to latest actions versions
ethomson Mar 16, 2024
ecf2c64
Merge pull request #6765 from libgit2/ethomson/actions
ethomson Mar 16, 2024
cc7764f
config: correct fetching the HIGHEST_LEVEL config
ethomson Mar 17, 2024
2fe50e2
Merge pull request #6766 from libgit2/ethomson/configfix
ethomson Mar 17, 2024
2eb3fec
fetch: avoid API breaking-changes from v1.7
ethomson Mar 17, 2024
dd35af3
repository: rearrange `git_repository_item_t` values
ethomson Mar 17, 2024
a035aa4
Merge pull request #6768 from libgit2/ethomson/v18_fixes
ethomson Mar 18, 2024
4504f2c
valgrind: suppress OpenSSL warnings
ethomson Mar 18, 2024
06c0ac6
Merge pull request #6769 from libgit2/ethomson/valgrind
ethomson Mar 18, 2024
647f8eb
ctype: only use custom functions on Windows
ethomson Dec 19, 2023
8e6beb3
ctype: switch to `git__` ctype functions
ethomson Dec 19, 2023
4675569
ntlmclient: use unsigned char for ctype functions
ethomson Mar 18, 2024
0f12a01
Merge pull request #6770 from libgit2/ethomson/ctype
ethomson Mar 18, 2024
9288436
ci: split SHA256 builds out into their own workflow
ethomson Mar 19, 2024
115db54
Merge pull request #6772 from libgit2/ethomson/actions
ethomson Mar 19, 2024
7940f09
v1.8: update COPYING file
ethomson Mar 16, 2024
5aa3ce7
v1.8: update version numbers
ethomson Mar 16, 2024
69f2577
v1.8: update changelog
ethomson Mar 17, 2024
9b29a5d
ci: update nightly workflows
ethomson Mar 20, 2024
d74d491
Merge pull request #6767 from libgit2/ethomson/v18
ethomson Mar 20, 2024
e2db98f
Merge pull request #6773 from libgit2/ethomson/ci
ethomson Mar 22, 2024
34073bf
commit: Fix git_commit_create_from_stage without author and committer
florianpircher Mar 24, 2024
7f1a39e
Merge pull request #6781 from Formkunft/fix-commit-create-from-stage
ethomson Mar 26, 2024
dd79fbb
ci: give all nightly builds a unique id
ethomson Mar 26, 2024
4bb051a
Merge pull request #6782 from libgit2/ethomson/ci
ethomson Mar 26, 2024
4d19e8c
settings: pull settings out into its own file
ethomson Mar 27, 2024
4839f4f
http: allow users more control over user-agent
ethomson Mar 27, 2024
6bed71e
docs: update includes
ethomson Apr 2, 2024
6122f00
docs: it's _return_ not _returns_
ethomson Apr 2, 2024
cc2a015
docs: document `git_remote_capability_t`
ethomson Apr 2, 2024
8afdad0
Merge pull request #6787 from libgit2/ethomson/docs
ethomson Apr 2, 2024
4b04354
process.c: fix environ for macOS
barracuda156 Apr 7, 2024
387d01c
cmake: remove workaround that isn't compatible with Windows on ARM
hackhaslam Apr 11, 2024
6e8227a
Bounds check for pack index read
ConradIrwin Apr 15, 2024
72d36a4
Merge pull request #6794 from stinb/windows-arm-build
ethomson Apr 18, 2024
9ddf612
Merge pull request #6788 from libgit2/ethomson/user_agent
ethomson Apr 18, 2024
93c9444
Merge pull request #6792 from barracuda156/apple
ethomson Apr 19, 2024
06cafdf
pack: upcast to `size_t` for bounds checking
ethomson Apr 19, 2024
3599de9
http: add llhttp as a bundled dependency
ethomson Apr 19, 2024
d396819
http: abstract http parsing out of httpclient
ethomson Apr 19, 2024
d02b549
http: make llhttp the default
ethomson Apr 22, 2024
98c4955
http: remove legacy bundled http-parser
ethomson Apr 19, 2024
64808a9
ci: fixes for fedora
ethomson Apr 22, 2024
15a8d87
ci: make fedora a nightly build
ethomson Apr 22, 2024
fb1797d
Merge remote-tracking branch 'origin/main' into libgit2-httpparser
ethomson Apr 22, 2024
b739aca
Merge pull request #6713 from sgallagher/llhttp
ethomson Apr 23, 2024
85d42ea
Merge pull request #6796 from ConradIrwin/no-oob
ethomson Apr 23, 2024
ffd881e
transport: provide a useful error message during cancellation
ethomson Apr 29, 2024
6423ffb
Merge pull request #6802 from libgit2/ethomson/cb_err
ethomson Apr 29, 2024
2fd37e1
transport: support sha256 oids
ethomson Mar 18, 2024
e5e233c
Merge pull request #6803 from libgit2/ethomson/sha256_transport
ethomson May 1, 2024
2d649cc
remote: drop bitfields in git_remote_fetch_options
ethomson May 6, 2024
322ea80
examples: fix memory leak in for-each-ref.c
qaqland May 8, 2024
60f219e
Revparse: Correctly accept ref with '@' at the end
csware May 8, 2024
8791a26
Merge pull request #6809 from csware/fix-revparse-at-at-end
ethomson May 13, 2024
26e0bd4
Merge pull request #6806 from libgit2/ethomson/fetch_opts
ethomson May 13, 2024
5f796f8
Merge pull request #6808 from qaqland/fix-demo-for-each-ref
ethomson May 13, 2024
b1d6fd0
cli: include alloca on illumos / solaris / sunos
ethomson May 13, 2024
99ba446
tree: avoid mixed signedness comparison
ethomson May 13, 2024
2fb07fd
rand: avoid uninitialized loadavg warnings
ethomson May 13, 2024
bb3c31f
xdiff: use proper free function
ethomson Apr 18, 2024
54218b5
array: treat `git_array` ptrs as `void *`
ethomson Apr 29, 2024
5647f6e
Merge pull request #6810 from libgit2/ethomson/xdiff
ethomson May 13, 2024
0e9eeec
Merge pull request #6812 from libgit2/ethomson/unused-warnings
ethomson May 13, 2024
9a2afb7
Merge pull request #6813 from libgit2/ethomson/opt_alloc
ethomson May 13, 2024
f5c6b6a
Merge pull request #6814 from libgit2/ethomson/alloc
ethomson May 13, 2024
c7af393
Merge pull request #6815 from libgit2/ethomson/signed_comparedness
ethomson May 13, 2024
aaed67f
alloc: introduce debug allocators
ethomson Apr 18, 2024
cfd6e01
tests: use git__ allocator functions consistently
ethomson Apr 18, 2024
afb2ef2
util: don't return system allocated strings in realpath
ethomson Apr 18, 2024
abedcfe
tests: reset the allocator to the default
ethomson Apr 18, 2024
eb00b48
fixup! alloc: introduce debug allocators
ethomson May 15, 2024
834ec0f
v1.8.1: update version numbers
ethomson May 15, 2024
ae65dac
v1.8.1: update changelog
ethomson May 15, 2024
36f7e21
Merge pull request #6817 from libgit2/ethomson/v1.8.1
ethomson May 16, 2024
6c5520f
Merge pull request #6811 from libgit2/ethomson/test_allocator
ethomson May 16, 2024
cc2082a
Add assert
Murmele Jun 11, 2024
635b3db
Merge pull request #6828 from Murmele/maint/v1.8
ethomson Jun 13, 2024
65a7ff0
http: Initialize ‘on_status’ when using the http-parser backend.
civodul Aug 28, 2024
a44f198
Apply suggestions from code review
civodul Aug 29, 2024
da3db63
v1.8.3: update changelog and version numbers
ethomson Oct 26, 2024
3353f78
Merge pull request #6931 from libgit2/ethomson/v1.8.3
ethomson Oct 26, 2024
94ba816
Revert "commit: fix const declaration"
ethomson Jun 13, 2024
73644b3
v1.8.4: update changelog and version numbers
ethomson Oct 30, 2024
3f4182d
Merge pull request #6936 from libgit2/ethomson/v1.8.4
ethomson Oct 30, 2024
ca1782f
Merge tag 'original-upstream' into merge2
Nov 14, 2024
7386d73
resolve conflicts
Nov 14, 2024
88a1a27
fix compiler errors
Nov 14, 2024
9de04da
fix build errors
Nov 15, 2024
a6debce
delete .github folder
Nov 15, 2024
119df7c
fix build
Nov 15, 2024
f6750ac
messing around
Nov 15, 2024
c6c99a9
fix tests
Nov 15, 2024
2fdb1d8
ignore failing tests from main
Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
* text=auto
ci/**/*.sh text eol=lf
script/**/*.sh text eol=lf
tests/resources/** linguist-vendored
19 changes: 0 additions & 19 deletions .github/ISSUE_TEMPLATE
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions .github/release.yml
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions .github/workflows/benchmark.yml
View file
Open in desktop

This file was deleted.

Loading