| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Introduce a `numberOfPackFilesAfterBitmap` that contains the number of
packfiles created since the latest bitmap generation.
Notes:
* the `repo.getObjectDatabase().getPacks()` that obtains the list of
packs (in the existing `getStatistics` function) uses
`PackDirectory.scanPacks` that boils down to call
`PackDirectory.scanPacksImpl` which is sorting packs prior returning
them therefore the `numberOfPackFilesAfterBitmap` is just all packs
before the one that has bitmap attached
* the improved version of `packAndPrune` function (one that skips
non-existent packfiles) was introduced for testing
Change-Id: I608011462f104fc002ac527aa405f492a8a4b0c2
|
| |
| |
| |
| | |
Change-Id: Ifdeafd040bca8331804c3e7568da0bee5cbd01df
|
|\|
| |
| |
| |
| |
| |
| |
| | |
* stable-6.10:
ResolveMerger: Allow setting the TreeWalk AttributesNodeProvider
Add Union merge strategy support
Change-Id: I0d768d793effd1deabb4807446a4f8c10a82ad74
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When a merger is created without a Repository, no
AttributesNodeProvider is created in the TreeWalk. Since mergers are
often created with a custom ObjectInserter and no repo, they skip any
lookups of attributes from any of the gitattributes files (within a
tree, in the repo info/ dir, or user/global). Since there are
potentially merge-affecting attributes in those files, callers might
want to use both a custom ObjectInserter and an AttributesNodeProvider.
Change-Id: I7997309003bbb598e1002261b3be7f2cc52066c8
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Allow users to specify the `union` strategy in their .gitattributes file
in order to keep lines from both versions of a conflict [1].
[1] https://git-scm.com/docs/gitattributes.html#Documentation/gitattributes.txt-union
Change-Id: I74cecceb2db819a8551b95fb10dfe7c2b160b709
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* stable-6.10:
Update Apache sshd to 2.14.0
LfsConnectionFactoryTest: remove unnecessary cast
JSchSshProtocol2Test: remove unnecessary cast
ApacheSshProtocol2Test: remove unnecessary cast
NoteMapMerger: remove unnecessary cast
Change-Id: I8fca74d88efadc827955b0a5032e6fbd72ce3e0d
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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: I08ed51b13aa269a4f6b64ac723b6bd7649c6591c
|
| |
| |
| |
| | |
Change-Id: Id3767f43cbbfd0c05f9a7f0d5620943da874df92
|
| |
| |
| |
| | |
Change-Id: Ie8e7b097e48342a9cda6873e8595146a1b3f1427
|
| |
| |
| |
| | |
Change-Id: I3be4963f506529bbadc5b6dfc0b625ee85effc1f
|
|\|
| |
| |
| |
| |
| |
| | |
* 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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
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
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: Id34a0be998eee360e69f74b469c4990afa153c1b
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
from
- FileUtils#lastModified
- FileUtils#setLastModified
- FS#getLastModifiedTime
- FS#lastModified
- FS#setLastModified
- FileTreeIterator.Entry#getEntryLastModified
- WorkingTreeIterator#getEntryLastModified
- WorkingTreeIterator.Entry#getEntryLastModified
Change-Id: I5073f05c32f8f626383a91048470c79332983121
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: Ib53de6dabea7f73ecfde85cb30f49fa05ee48551
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: Ia72cc228b0acaa8df8f405bd224916cc76eadd22
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: Ifffcfa6bf9baf9f6879a5a7e0f05d317347983f6
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: Ieeeb33b8b3dc8272023af5d47b3330f4a94c5b96
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I1143612088dba4fdced8f14c97293d17ff9658bb
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I1b7ba9f7e3dffe54313fc5d27051ad56a02a05b9
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: If254177fd7914cb1f909f6620032bb4016208855
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I79923b95861af983b676d436938aaeebe8c5b658
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I3040f655318c47f268433294720a99325ae78863
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I7d0bdb61a8698e94bb40c22fe1c40c70cec65dfc
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: Id2bdcb865203ed192fea35cfcf82c34667710726
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I14e78bcd4bbdb491bcc44a53ff19609b79c0831b
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I473dff6bdc23cfb126d22e18c168390a0e21301d
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I1c16196bba00a5d0f54c10261cc08185305ba4a3
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I89f42db2b9dabee18d4220457436b9f9b6340f50
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I4e5f96696b57512488f48e66a82760b2e8671878
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: If2d3c1a96560e0bc5e352bdbcab4c191cbed1a42
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I3521ba8f8456160bd18ccb22c7d4a131aaac4ff2
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I5bd8d0c292151bfa58325d51ef51928715871cf1
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I72544d2b3c85b8f96c2b8f94b86fb9b362f09475
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I9b77142127cc96ee6658e85a6cf0586d941c5c0c
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
- FileSnapshot#lastModified
- LockFile#getCommmitLastModified
Change-Id: I6962166ca5decbb332dfb25851c93debfe2ca90c
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Change-Id: I8db6b1dd8e39811ebde676389833dbc906106452
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
- boolean mightBeRacilyClean(int, int)
- long getLastModified()
- void setLastModified(long)
Change-Id: I428fbb2109e13e80b8655622531c10e55a922a6f
|