summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update orbit to I20210713220109Matthias Sohn2021-07-1640-206/+269
| | | | | | | | | | | | | | | | | | | | | update - org.apache.commons.compress to 1.20.0.v20210713-192 - org.bouncycastle.bcpg to 1.69.0.v20210713-1924 - org.bouncycastle.bcpkix to 1.69.0.v20210713-1924 - org.bouncycastle.bcprov to 1.69.0.v20210713-1924 - add org.bouncycastle.bcutil 1.69.0.v20210713-1924 In bazel build don't expose bouncycastle to org.eclipse.jgit since it's not used there anymore since code depending on bouncycastle was moved to org.eclipse.jgit.gpg.bc. CQ: 21771 CQ: 23471 CQ: 23472 CQ: 23473 CQ: 23474 Change-Id: Id3d94c00c39bbc57e3f49a61150841249dc3985c
* Update orbit to I20210711110031Matthias Sohn2021-07-1650-147/+155
| | | | | | | | | | | | | | | and update - assertj to 3.20.2.v20210706-1104 - hamcrest to 2.2.0.v20210711-0821 - classes which were in org.hamcrest.core 1.3 and org.hamcrest.library 1.3 were all moved to org.hamcrest in 2.2 - the annotation org.hamcrest.Factory was removed and is no longer needed - junit 4.13 requires hamcrest-core and hamcrest-library 1.3 therefore keep them in the target platform CQ: 23501 Change-Id: Ife871c0343b611be9203aed7f86577e85bbf5c95
* [sshd] Ignore revoked keys in OpenSshServerKeyDatabase.lookup()Thomas Wolf2021-07-162-11/+18
| | | | | | It makes no sense to return revoked keys. Change-Id: I99eee1de3dba5c0c8d275b7c1a24053874b3cb03 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* [sshd] Distinguish key type and signature algorithm for host keyThomas Wolf2021-07-161-0/+6
| | | | | | | | | | | | | | | | | | | | | Since the introduction of the rsa-sha2-512 and rsa-sha2-256 signature types, the key type for RSA is no longer automatically the signature algorithm. We re-order the list for the host key proposal such that keys we already have are preferred; this minimizes warnings about new host keys. When doing so, put all of rsa-sha2-512, rsa-sha2-256, and ssh-rsa at the front, in that order, not just ssh-rsa. This ensures that we do prefer RSA keys if we already have an RSA host key, but at the same time we still prefer the stronger signature algorithms over the weaker and deprecated SHA1-based ssh-rsa signature. It also helps avoid a bug found in some Github versions where the Github SSH server uses a rsa-sha2-512 signature even though ssh-rsa was negotiated.[1] [1] https://www.eclipse.org/forums/index.php/t/1108282/ Bug: 574635 Change-Id: I0a49dcfa0c2c93f23118c983cd0bc9e5a467d886 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* [sshd] Implement SSH config KexAlgorithmsThomas Wolf2021-07-169-37/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the used KEX algorithms configurable via the ssh config. Also implement adding algorithms not in the default set: since sshd 2.6.0 deprecated SHA1-based algorithms, it is possible that the default set has not all available algorithms, so adding algorithms makes sense. This enables users who have to use a git server that only supports old SHA1-based key exchange methods to enable those methods in the ssh config: KexAlgorithms +diffie-hellman-group1-sha1 There are two more SHA1 algorithms that are not enabled by default: diffie-hellman-group14-sha1 and diffie-hellman-group-exchange-sha1. KeyAlgorithms accepts a comma-separated list of algorithm names. Since adding algorithms is now supported, adapt the handling of signature algorithms, too. Make sure that definitions for the KEX exchange signature (HostKeyAlgorithms) don't conflict with the definition for signatures for pubkey auth (PubkeyAcceptedAlgorithms). HostKeyAlgorithms updates the signature factories set on the session to include the default factories plus any that might have been added via the SSH config. Move the handling of PubkeyAcceptedAlgorithms from the client to the JGitPubkeyAuthentication, where it can be done only if pubkey auth is attempted at all and where it can store its adapted list of factories locally. Bug: 574636 Change-Id: Ia5d5f174bbc8e5b41e10ec2c25216d861174e7c3 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* Update orbit to S20210705204906Matthias Sohn2021-07-0834-67/+67
| | | | Change-Id: Ib4ec9f80a8a346fa8c709e58f8076372d14eca64
* Update jetty to 9.4.43.v20210629Matthias Sohn2021-07-0819-355/+355
| | | | Change-Id: I4ceea58cb0a04d041ca4e698e096a00ccd12bfc0
* Update JMH used in benchmarks to 1.32Matthias Sohn2021-07-083-6/+6
| | | | | | Change-Id: I98734165de8256ab1461733169957efbfa5f36e4 CQ: 23499 CQ: 23500
* Update target platform to I20210626190330Thomas Wolf2021-07-0645-783/+426
| | | | | | | | | | | | | | | | | | | | | | | | Update - com.google.gson to 2.8.7.v20210624-1215 - javaewah to 1.1.12.v20210622-2206 - org.apache.sshd.osgi to 2.7.0.v20210623-0618 - org.apache.sshd.sftp to 2.7.0.v20210623-0618 - org.tukaani.xz to 1.9.0.v20210624-1259 - Apache MINA sshd to 2.7.0 - Remove work-arounds for problems resolved upstream since 2.6.0, and adapt to upstream API changes. - update DEPENDENCIES. CQ: 23469 CQ: 23470 CQ: 23496 CQ: 23497 CQ: 23498 Bug: 574220 Change-Id: I898b216c3492f8488fbf25fa4b49f1250f86f3c8 Also-by: David Ostrovsky <david@ostrovsky.org> Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add 4.21 target platformMatthias Sohn2021-07-012-0/+104
| | | | Change-Id: I88d32956fd7ad5c23aa395abd88f35359b519b79
* Update 4.20 target platform to use final 4.20 releaseMatthias Sohn2021-07-013-10/+10
| | | | Change-Id: I8d6a1617a7713faf5186cfb5b2a084d0f1f9e63f
* Merge "Remove use of deprecated getAllRefs() in ReceivePack"Matthias Sohn2021-07-011-1/+19
|\
| * Remove use of deprecated getAllRefs() in ReceivePackLuca Milanesio2021-06-261-1/+19
| | | | | | | | | | | | | | | | | | | | | | Repository.getAllRefs() is deprecated and should not be used anymore. Leverage the ref-db and the retrieval of refs by prefix and adapt the result to the expected refname/ref map. Bug: 534731 Change-Id: I37a9092859f220ddc4e5063d01544f3e82208be8 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
* | [pgm] Fix default meta variable defined in StopOptionHandlerMatthias Sohn2021-06-281-1/+1
| | | | | | | | Change-Id: I703718e2476d40d34b11083414ac0ed5e34bf90a
* | Fix typo in javadoc of PathTreeFilterHandlerMatthias Sohn2021-06-281-1/+1
|/ | | | Change-Id: Icf0dc814baf0dc44addd102d9c03b821b4022a84
* Merge branch 'stable-5.12'Matthias Sohn2021-06-265-14/+113
|\ | | | | | | | | | | | | | | * stable-5.12: Retry loose object read upon "Stale file handle" exception Ignore missing javadoc in test bundles Change-Id: I67c613c066a3252f9b0d0a3dcc026b57e10bfe1d
| * Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2021-06-265-14/+113
| |\ | | | | | | | | | | | | | | | | | | | | | * stable-5.11: Retry loose object read upon "Stale file handle" exception Ignore missing javadoc in test bundles Change-Id: Ia4dc886c920cec3c9da86e1a90a0af68bd016b4f
| | * Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-06-265-14/+113
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.10: Retry loose object read upon "Stale file handle" exception Ignore missing javadoc in test bundles Change-Id: Ia385fa6b5d2fee64476793e06860a279bf2f6e36
| | | * Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-06-255-17/+112
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.9: Retry loose object read upon "Stale file handle" exception Ignore missing javadoc in test bundles Change-Id: I56fc2c47193a891285a705d44b3507f23982dc8a
| | | | * Retry loose object read upon "Stale file handle" exceptionAntonio Barone2021-06-244-16/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading loose objects over NFS it is possible that the OS syscall would fail with ESTALE errors: This happens when the open file descriptor no longer refers to a valid file. Notoriously it is possible to hit this scenario when git data is shared among multiple clients, for example by multiple gerrit instances in HA. If one of the two clients performs a GC operation that would cause the packing and then the pruning of loose objects, the other client might still hold a reference to those objects, which would cause an exception to bubble up the stack. The Linux NFS FAQ[1] (at point A.10), suggests that the proper way to handle such ESTALE scenarios is to: "[...] close the file or directory where the error occurred, and reopen it so the NFS client can resolve the pathname again and retrieve the new file handle." In case of a stale file handle exception, we now attempt to read the loose object again (up to 5 times), until we either succeed or encounter a FileNotFoundException, in which case the search can continue to Packfiles and alternates. The limit of 5 provides an arbitrary upper bounds that is consistent to the one chosen when handling stale file handles for packed-refs files (see [2] for context). [1] http://nfs.sourceforge.net/ [2] https://git.eclipse.org/r/c/jgit/jgit/+/54350 Bug: 573791 Change-Id: I9950002f772bbd8afeb9c6108391923be9d0ef51
| | | | * Ignore missing javadoc in test bundlesMatthias Sohn2021-06-249-9/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I83ed20823dc6b22ff48c2a554acb2f7d3b6067b7
* | | | | searchForReuse might impact performance in large repositoriesFabio Ponciroli2021-06-2511-0/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The search for reuse phase for *all* the objects scans *all* the packfiles, looking for the best candidate to serve back to the client. This can lead to an expensive operation when the number of packfiles and objects is high. Add parameter "pack.searchForReuseTimeout" to limit the time spent on this search. Change-Id: I54f5cddb6796fdc93ad9585c2ab4b44854fa6c48
* | | | | Upgrade maven-dependency-plugin to 3.2.0Marco Miller2021-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9dea176e8b30658bcb6a9dee8c54184c0fa86de8 Signed-off-by: Marco Miller <marco.miller@ericsson.com>
* | | | | Upgrade jacoco-maven-plugin to 0.8.7Marco Miller2021-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6742b2d8ec75422542a55a9840bfe43e8cf17400 Signed-off-by: Marco Miller <marco.miller@ericsson.com>
* | | | | Upgrade maven-jxr-plugin to 3.1.1Marco Miller2021-06-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I66d7589ea1b823305d908acb13367ef78ef55f7a Signed-off-by: Marco Miller <marco.miller@ericsson.com>
* | | | | Fix garbage collection failing to delete pack fileandrewxian20002021-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The loosen() method has opened pack file and the open pack file handle may prevent it from being deleted e.g. on Windows. Fix this by closing the pack file only after loosen() finished. Bug: 574178 Change-Id: Icd59931a218d84c9c97b450eea87b21ed01248ff Signed-off-by: andrew.xian2000@gmail.com Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | Fix PathSuffixFilter: can decide only on full pathsThomas Wolf2021-06-213-6/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a subtree, a PathSuffixFilter must return -1 ("indeterminate"), not 0 ("include"), otherwise negation goes wrong: an indeterminate result (-1) is passed on, but a decision (0/1) is inverted. As a result a negated PathSuffixFilter would skip all folders. Bug: 574253 Change-Id: I27fe785c0d772392a5b5efe0a7b1c9cafcb6e566 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | Update jetty to 9.4.42.v20210604Matthias Sohn2021-06-2118-335/+335
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie0abae5686064ccfeb34e8af0d98471162036b00
* | | | | [sshd] Log the full KEX negotiation resultThomas Wolf2021-06-191-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apache MINA sshd doesn't log all values, but it'd be very helpful to debug KEX problems. Change-Id: I5a19023c929f39caccde489d51a6fdca711fe5ff Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | [releng] japicmp: update last release versionThomas Wolf2021-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The baseline for the 5.13 release is 5.12.0.202106070339-r. Change-Id: Ic4730ca296117d7a7f6e86228ce2393a748c3c06 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | CONTRIBUTING: add explicit link to ECAMatthias Sohn2021-06-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was requested in the 5.12 release review. Bug: https://gitlab.eclipse.org/eclipsefdn/emo-team/emo/-/issues/58 Change-Id: I21abe960412a7bc7a0d2f3bdfc4a1d031a700c3b
* | | | | CONTRIBUTING: Use standard markdown formatMatthias Sohn2021-06-151-28/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic64a62ca29950fb6a4c3c8a31bee8173c005ea4e
* | | | | Add Eclipse code of conduct and security policyMatthias Sohn2021-06-152-0/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was requested in the 5.12 release review. Bug: https://gitlab.eclipse.org/eclipsefdn/emo-team/emo/-/issues/58 Change-Id: Ifbfa4c239e8ce0da6d5571362a12c20c399b64e4
* | | | | Fix @since from commit 64d0aaa2Thomas Wolf2021-06-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That commit was submitted on master between the 5.12.0 release and the 5.13.0 version bump. Change-Id: I679e818bfc5a4695b66548add9a83a22c89a4ffc Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | Prepare 5.13.0-SNAPSHOT buildsMatthias Sohn2021-06-1488-503/+503
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie9cfc1eeb0eda7b2bbe744a22a7e4cfe6d59bc37
* | | | | Merge branch 'stable-5.12'Matthias Sohn2021-06-14111-988/+1196
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.12: Prepare 5.12.1-SNAPSHOT builds JGit v5.12.0.202106070339-r [license-check] Update list of project dependencies [errorprone] Fix warning InputStreamSlowMultibyteRead [errorprone] Make operator precedence explicit in OpenSshConfigFile Update jetty to 9.4.41.v20210516 Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Optimize RefDirectory.isNameConflicting() Update bazlets and bazel version Change-Id: I9bd4dfc3796a5034be7b3e86b35ef591bb516a2c
| * | | | Merge branch 'stable-5.11' into stable-5.12Matthias Sohn2021-06-140-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.11: Change-Id: Ifdbddcde74dda9895bcdd90f1be201c3ceca2b29
| | * | | Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-06-143-119/+317
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.10: Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Optimize RefDirectory.isNameConflicting() Update bazlets and bazel version Change-Id: I265425194c24fd82cbeff869ce41cbc9b73571a2
| * | | | Merge "Prepare 5.12.1-SNAPSHOT builds" into stable-5.12Matthias Sohn2021-06-1388-503/+503
| |\ \ \ \
| | * | | | Prepare 5.12.1-SNAPSHOT buildsMatthias Sohn2021-06-1388-503/+503
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idf266c34aa9a04cf9c5e0e09bcb415c13d773d4c
| * | | | | Merge "Merge branch 'stable-5.10' into stable-5.11" into stable-5.12Matthias Sohn2021-06-133-119/+317
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'stable-5.10' into stable-5.11Matthias Sohn2021-06-133-119/+317
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.10: Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Optimize RefDirectory.isNameConflicting() Update bazlets and bazel version Change-Id: I50dcc037a96f3a4237c09516c82e1c18acbd2e0b
| | | * | Merge branch 'stable-5.9' into stable-5.10Matthias Sohn2021-06-133-119/+317
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.9: Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Optimize RefDirectory.isNameConflicting() Update bazlets and bazel version Change-Id: Ib1299564a4cfb9c01f422d7ada05fcfac29700f8
| | | | * Merge branch 'stable-5.8' into stable-5.9Matthias Sohn2021-06-133-119/+317
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.8: Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Optimize RefDirectory.isNameConflicting() Update bazlets and bazel version Change-Id: I9abf7dd8b8e5eb3199fd6b43a4653c4e4cf4bf1b
| | | | | * Merge branch 'stable-5.7' into stable-5.8Matthias Sohn2021-06-133-119/+317
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.7: Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Optimize RefDirectory.isNameConflicting() Update bazlets and bazel version Change-Id: I1ee0d01c14fb7dca151b4e7ae1b989da5a3a01e3
| | | | | | * Merge branch 'stable-5.6' into stable-5.7Matthias Sohn2021-06-133-119/+317
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.6: Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Optimize RefDirectory.isNameConflicting() Update bazlets and bazel version Change-Id: I4570cce185877cb4c50eee519a1cf9467a766dea
| | | | | | | * Merge branch 'stable-5.5' into stable-5.6Matthias Sohn2021-06-133-119/+317
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.5: Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Optimize RefDirectory.isNameConflicting() Update bazlets and bazel version Change-Id: I504483a4dc979c5e7af18bad45dc18675e32afd2
| | | | | | | | * Merge branch 'stable-5.4' into stable-5.5Matthias Sohn2021-06-055-115/+324
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.4: Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Optimize RefDirectory.isNameConflicting() Update bazlets and bazel version Change-Id: If5232b68d3e25df7b71e417cbcbb39476e925f22
| | | | | | | | | * Merge branch 'stable-5.3' into stable-5.4Matthias Sohn2021-06-055-115/+324
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.3: Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Optimize RefDirectory.isNameConflicting() Update bazlets and bazel version Change-Id: I1338fc79a7be6b77fb28df511dd7504fb19b6d1a
| | | | | | | | | | * Merge branch 'stable-5.2' into stable-5.3Matthias Sohn2021-06-055-115/+324
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.2: Prepare 5.1.17-SNAPSHOT builds JGit v5.1.16.202106041830-r BatchRefUpdate: Skip saving conflicting ref names and prefixes in memory BatchRefUpdateTest: Accurately assert RefsChangedEvent(s) fired Optimize RefDirectory.isNameConflicting() Update bazlets and bazel version Change-Id: I7838f7d237a3598bf55995426d7ba1de146cb6ad