| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes an 'incorrect signature' error when trying to use the keys
generated by SSHD during server init with an OpenSSH client.
This also includes a few other changes since 2.13.2:
* GH-524 Performance improvements
* GH-533 Fix multi-step authentication
* GH-582 Fix filtering in NamedFactory
* GH-587 Prevent NullPointerExceptionon closed channel in NettyIoSession
* GH-590 Better support for FIPS
* GH-597 Pass on Charset in ClientSession.executeRemoteCommand()
https://github.com/apache/mina-sshd/releases/tag/sshd-2.14.0
Change-Id: I76909fd56e70ee4ce16a075bd40ed6b2a609cc47
|
|
|
|
| |
Change-Id: I641c4dc44af47106149804fa05313d62d4f33325
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Currently difference in binary files during merge will cause them to be
added to unmergedPaths regardless of whether ignoreConflicts is true.
This creates an issue during merging with strategy "RECURSIVE", as it
makes it impossible to create a virtual commit if there is a difference
in a binary file. Resulting in the
CONFLICTS_DURING_MERGE_BASE_CALCULATION error being thrown.
This is especially problematic, since JGit has a
rather simplistic rules for considering file binary, which easily leads
to false positives.
What we should do instead is keep OURS. This will not lead to silently
ignoring difference in the final result. It will allow creation of
virtual merge-base commit, and then the difference would be presented
again in the final merge results. In essense it only affects what's
shown as BASE in 3-way merge.
Additionally, this is correct because
- It's consistent with treatment of other unmergeable entities, for
example Gitlinks
- It's consistent with behaviour of CGit:
- https://git-scm.com/docs/gitattributes#Documentation/gitattributes.txt-binary
states on diffs in binary OURS is picked by default.
- In code: https://git.kernel.org/pub/scm/git/git.git/tree/merge-ll.c#n81
- ignoreConflicts in CGit afterwards ignores all issues with content
merging https://git.kernel.org/pub/scm/git/git.git/tree/merge-ort.c#n5201
We also adjust the behaviour when .gitattributes tell us to treat the
file as binary for the purpose of the merge.
We only change the behaviour when ignoreConlicts = true, as otherwise
the current behaviour works as intended.
Change-Id: I2b69f80a13d250aad3fe12dd438b2763f3022270
|
|
|
|
|
|
|
|
|
|
| |
The addition of a name will help show statistics broken down per inner
cache table when more than one cache table is used.
The name configuration is obtained from the config subsection name
prefixed by `dfs`, or `dfs` for the base case.
Change-Id: Ia16c794f094d756441b779e3b1f1a3c992443509
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Adds the usage of PackExtBlockCacheTable to the
DfsBlockCache, replacing the current DfsBlockCacheTable
when PackExtCacheConfigurations exists.
When no PackExtCacheConfigurations exists the current
DfsBlockCacheTable implementation will be used.
Change-Id: I42222a0cb43785baba907a49077dd9874d19d891
|
| |
| |
| |
| | |
Change-Id: I08ed51b13aa269a4f6b64ac723b6bd7649c6591c
|
| |
| |
| |
| | |
Change-Id: Id3767f43cbbfd0c05f9a7f0d5620943da874df92
|
| |
| |
| |
| | |
Change-Id: Ie8e7b097e48342a9cda6873e8595146a1b3f1427
|
| |
| |
| |
| | |
Change-Id: I3be4963f506529bbadc5b6dfc0b625ee85effc1f
|
| |
| |
| |
| | |
Change-Id: I6da7acb4fb8188a5bd32382eca12593febff29b7
|
| |
| |
| |
| | |
Change-Id: I164964b2173ee285d35d6d3a29caf30c0b8a6f95
|
| |
| |
| |
| | |
Change-Id: Ib17b92d6f413f706ff97fb4ccf07847f4b5808ad
|
| |
| |
| |
| | |
Change-Id: Ib3030b917ffb1a02115345e9050180313efdc19b
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is meant to help diagnose LOCK_FAILURE errors, which otherwise provides
very little information in
https://eclipse.googlesource.com/jgit/jgit/+/refs/heads/master/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java#731.
Change-Id: I3d544c899fe66effbd107ea2f38d73f6f253a7e6
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The constructor of GC sets exactly the same config. Remove this
set to make clearer from where the config is coming.
Change-Id: Idb71c7827f180923092ef5392545df81960ee93a
|
|\| | | |
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
PackConfig can be constructed from the repo or from a config. While
browing the code, it is easier to follow the provenance of the
configuration when using the repository constructor.
Use the PackConfig(Repository) constructor in the
DfsInserter. Internally it calls PackConfig(repo.getConfig()) so this
should be a noop.
Change-Id: Ifce5bc87404ca8ec9a821d28253d489056faad9a
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | | |
* stable-7.0:
AdvertisedRequestValidator: fix WantNotValidException caused by race
Change-Id: If885f81c5273693c0c9c6efcfe4b646ab936cefe
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* stable-6.10:
AdvertisedRequestValidator: fix WantNotValidException caused by race
Change-Id: I22ec79d91136f8209a3799465db5593d83f7bea9
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* stable-6.9:
AdvertisedRequestValidator: fix WantNotValidException caused by race
Change-Id: I662c7a76470cedf0d4c975c50c3981c1c86245f2
|
| | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* stable-6.8:
AdvertisedRequestValidator: fix WantNotValidException caused by race
Change-Id: Ia5a0a4f0e900d96fa638bb9f97988ac66f4b7068
|
| | | | |\ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* stable-6.7:
AdvertisedRequestValidator: fix WantNotValidException caused by race
Change-Id: I1e485422608cf55373c1d86c4c0d50c9f9f49f20
|
| | | | | |\ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* stable-6.6:
AdvertisedRequestValidator: fix WantNotValidException caused by race
Change-Id: I5b7b097a4b57ec48a3ee20fc25cb0d080cc1af80
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Fetch with protocol V2 failed under the following conditions
- fetch uses bidirectional protocol (git, ssh) which uses a shortcut
to determine invalid wants
- not all wants are advertised
- race condition: wanted ref is updated during fetch by another thread
after the thread serving upload-pack determined wants and before it
checks not advertised wants
Fix this by calling
`new ReachableCommitRequestValidator().checkWants(up, wants)`
instead of throwing WantNotValidException in [1]
if this race happened in the same way like it's done for unidirectional
protocols (http) [2].
[1] https://github.com/eclipse-jgit/jgit/blob/stable-6.10/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java#L2002
[2] https://github.com/eclipse-jgit/jgit/blob/stable-6.10/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java#L2000
Bug: jgit-48
Change-Id: I32f28502923815dc49781aab5d810c9afbe7e7e6
|
|\ \ \ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The reader can get IOException when reading the object size index, but
that index is an optimization, the size should still be available in
the pack.
Use the regular #getObjectSize() as a fallback when we get an
IOException from the object size index.
Change-Id: Ic5ec2cfc7c698aa94c6cfd5960cbab6c129f595a
|
|/ / / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Implementations of the iterator out of package receive a MutableEntry but they don't have a way to set data into it.
Add setters to the MutableEntry via protected methods in the iterator. This way, only implementors of the Iterator can modify the entry (cannot be modified e.g. by callers).
Change-Id: Id50c69d8be230ebdb8108acc47df13abcad0af0a
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
At construction time, PackWriter receives the PackConfig as a
parameter or reads it from the repository. The only exception is when
the constructor receives only a reader (no repo nor conf
provided?!).
Remove PackWriter(Reader) and let callers be explicit what conf to
use. This makes clearer the flow of conf in the PackWriter.
Change-Id: If12e122797ffc8c44fc3c435ca1b000ca016645b
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The iterator keeps the current position in the index and the MutableEntry reads data from there on-demand, but the iterator needs to know about the entry and this creates a complicated interaction.
Make MutableEntry a simple data object and let the iterator iterate and populate it before returning it. Code is clearer and implementors only needs to worry about the iterator.
This fixes also MutableEntry visibility, that was preventing subclassing from out of the package.
Change-Id: I35010d1f80237e421dd51b8d3d61a8ecb03e0d01
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I7aa2a3ee8e5ad107992309ea1fd82eaa73bf59d6
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I05772a87c351fed631d386c034e01fca9ec38fb1
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I27a657a424050f0d7cacaec0f504c00f2c77b62a
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I244dab5dec191497ad794cd16884f2392d0fa3b8
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
and update org.apache.ant to 1.10.15 since Orbit updated to Ant 1.10.15.
See https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12/
Change-Id: I865decbad55f0b7ca998b37cafa6c0a1eb183734
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I30e6d8cf0690184f081d7f39d5733d4e46b86e0c
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Position in the API refers to reverse-index position
(offset order), not primary index position (sha1 order)
Change-Id: I7dbe314dac1b3a128dd1c4ed93b9be28fd0802cc
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Using the implementation provided in the JDK since Java 1.6 by
`String#getBytes(Charset)` reduces JGit maintenance effort and improves
performance.
The method Constants#encode was implemented when JGit still used Java
1.5. See [1].
Kudos to Marcin for proposing to use this improvement in RefWriter [2].
I think it should be used generally.
[1] https://repo.or.cz/jgit.git?a=commit;h=bfa3da225f198b19061158499b1135aff07d85b3
[2] https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/1195180
Also-By: Marcin Czech <maczech@gmail.com>
Change-Id: I361ed6286b98351a315b8a8ffc3cb845831d35b2
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I5245a8b095174946abcbbb899f9c0a7dfd504cb4
Signed-off-by: Thomas Wolf <twolf@apache.org>
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: Iba206a2d4645fc275cd2cd1cb3ae965b8ceafb28
|
|\| | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* stable-7.0:
Prepare 7.0.1-SNAPSHOT builds
JGit v7.0.0.202409031743-r
Revert "Remove deprecated LocalDiskRepositoryTestCase#create(boolean,boolean)"
Remove deprecated JschSession#getSftpChannel method
Remove deprecated AutoLFInputStream constructors
Remove deprecated RawParseUtils#UTF8_CHARSET
Remove deprecated FS#setAsyncFileStoreAttributes method
FS, FS_Posix: remove deprecated #createNewFile(File) method
Remove deprecated lastModified methods using long
UserAgent: remove deprecated #getAgent, #hasAgent methods
Remove deprecated Transport#getFilterBlobLimit methods
Remove deprecated RefAdvertiser#send(Map<String, Ref>) method
Remove deprecated ReceivePack#setEchoCommandFailures method
Remove deprecated class ReceivePack.FirstLine
PacketLineIn: make deprecated #END and #DELIM private
WindowCacheStats: remove deprecated #getOpenFiles, #getOpenBytes
Remove deprecated PatchApplier#applyPatch(InputStream)
Remove deprecated MergeMessageFormatter#formatWithConflicts
Remove deprecated MergeFormatter#formatMerge using charset name
Remove deprecated MergeFormatter#formatMerge using charset name
Remove deprecated TagBuilder#toByteArray method
Remove deprecated Repository#hasObject(AnyObjectId) method
Make deprecated Repository#peel(Ref) private
Remove deprecated RefDatabase#getRef(String) method
CoreConfig: remove deprecated #isLogAllRefUpdates method
Constants: remove deprecated #CHARSET and #CHARACTER_ENCODING
Remove deprecated ConfigConstants#CONFIG_KEY_STREAM_FILE_TRESHOLD
Remove deprecated CommitBuilder#setEncoding(String) method
Remove deprecated static #equals(AnyObjectId, AnyObjectId) method
Remove deprecated FileSnapshot.save(long) method
Remove deprecated lastModified accessors returning long
Remove deprecated PackInvalidException constructors
DirCacheEntry: remove deprecated methods
Remove deprecated DirCacheCheckout#checkoutEntry methods
Remove deprecated StashApplyCommand#setApplyUntracked method
Remove deprecated StashApplyCommand#setApplyIndex method
Remove deprecated RemoteSetUrlCommand#setUri method
Remove deprecated RemoteSetUrlCommand#setPush method
Remove deprecated RemoteSetUrlCommand#setName method
Remove deprecated RemoteRemoveCommand#setName method
Remove deprecated CheckoutCommand#setForce method
Remove deprecated CheckoutCommand#setForce method
Remove deprecated static AnyLongObjectId#equals method
Remove deprecated LocalDiskRepositoryTestCase#create(boolean,boolean)
Remove unused API warning filters
ObjectDirectoryTest: ensure WindowCursor is closed
PackExtBlockCacheTableTest: fix empty block warning
PackExtBlockCacheTableTest: suppress unchecked conversion warnings
PackObjectSizeIndexV1: fix boxing warnings
PackExtBlockCacheTableTest: suppress boxing warning on test class
DfsBlockCacheConfigTest: suppress boxing warning on test class
Suppress non-externalized string warnings
Update jakarta.servlet:jakarta.servlet-api to 6.1.0
Update org.apache.commons:commons-compress to 1.27.1
Update org.tukaani:xz to 1.10
Update org.assertj:assertj-core to 3.26.3
Update org.apache.commons:commons-lang3 to 3.16.0
Update bytebuddy to 1.15.0
Update commons-logging:commons-logging to 1.3.4
Update commons-codec:commons-codec to 1.17.1
Update jetty to 12.0.12
Prepare 7.0.0-SNAPSHOT builds
JGit v7.0.0.202408271414-rc1
Prepare 7.0.0-SNAPSHOT builds
JGit v7.0.0.202408202050-m3
JGit v7.0.0.202408201547-m3
JGit v7.0.0.202409201410-m3
Change-Id: Ia2913076aa8ecdfa0c51752a6076658505f6736e
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I5a6a9e398d8b81bf7bd0afbd6c82116d4472a349
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Change-Id: I86507936091e6f7af7588835722672ff2668a205
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
LocalDiskRepositoryTestCase#create(boolean,boolean)"
This reverts commit 3682611cef41ade46cf5ac194f0674b46367a395.
Reason: removing this deprecated method caused a ton of warnings about
closing an already closed Repository when running tests.
Change-Id: I3e9f224c55c167f92dad39caabfab5e43cf54cfb
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I5b5d3cbc6b0e5f85df26fe6c288c973cf5609296
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I00241e45d947582886658fa528cc20a961fed9e6
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: I4b3f1344f77a575b2d0e00462806eddb4e9a6b80
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Change-Id: Iea9f61fd65772ab247b382c93035e3c9974705aa
|