aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable-6.10' into stable-7.0stable-7.0Matthias Sohn6 days6-59/+66
|\
| * FileSnapshot: fix warningsMatthias Sohn6 days1-1/+2
| * Optionally.Hard: avoid Optional creation on every use,Martin Fick9 days1-4/+4
| * Pack: fix threading bug getting idxMartin Fick9 days1-46/+40
| * Fix potential NPE in TreeWalk#getFilterCommandDefinitionNasser Grainawi11 days1-0/+3
| * Advertise "agent" capability when using protocol v2Antonio Barone12 days2-6/+7
| * FileSnapshot: silence "Stale file handle" exceptionsMartin Fick2024-12-051-3/+11
* | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-12-069-48/+89
|\|
| * Merge changes I022639c4,I1fcce5ef into stable-6.10Matthias Sohn2024-12-051-15/+20
| |\
| | * FileSnapshot: silence "Not a Directory" exceptionsMartin Fick2024-12-051-0/+5
| | * FileSnapshot: refactor to share error handlingMartin Fick2024-12-051-15/+15
| * | Merge changes I172c43ff,I2a4c5743,Icc4b8d2f into stable-6.10Matthias Sohn2024-12-053-10/+20
| |\ \
| | * | Mark Attribute#getValue as @NullableMatthias Sohn2024-12-051-0/+3
| | * | Fix potential NPE in ResolveMerger#getAttributesContentMergeStrategyMatthias Sohn2024-12-051-3/+6
| | * | Fix NPE in DiffFormatter#getDiffDriverMatthias Sohn2024-12-051-7/+11
| | |/
| * / Pack: ensure packfile is still valid while still recoverableMartin Fick2024-12-041-1/+7
| |/
| * WindowCache: add bulk purge(), call from bulk sitesMartin Fick2024-12-023-21/+37
| * UploadPack#implies: add missing @since tagMatthias Sohn2024-12-022-1/+11
| * Disable MergeToolTest#testEmptyToolNameMatthias Sohn2024-12-021-0/+2
* | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-11-265-156/+229
|\|
| * Merge "Pack.java: Recover more often in Pack.copyAsIs2()" into stable-6.10Matthias Sohn2024-11-261-142/+153
| |\
| | * Pack.java: Recover more often in Pack.copyAsIs2()Martin Fick2024-11-111-142/+153
| * | PackDirectory: Filter out tmp GC pack filesMartin Fick2024-11-222-1/+9
| * | Test advertised capabilities with protocol V0 and allow*Sha1InWantpszlazak2024-11-211-0/+42
| * | Align request policies with CGitpszlazak2024-11-211-13/+25
* | | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-11-2113-192/+768
|\| |
| * | DiffDriver: fix doc for rust built-inKaushik Lingarkar2024-11-201-1/+1
| * | DiffDriver: fix formatting of javadocMatthias Sohn2024-11-201-10/+10
| * | Merge "Add numberOfObjectsSinceBitmap to RepoStatistics" into stable-6.10Matthias Sohn2024-11-202-7/+93
| |\ \
| | * | Add numberOfObjectsSinceBitmap to RepoStatisticsJacek Centkowski2024-11-202-7/+93
| * | | Merge "Don't fail when trying to prune pack which is already gone" into stabl...Luca Milanesio2024-11-202-80/+5
| |\| |
| | * | Don't fail when trying to prune pack which is already goneJacek Centkowski2024-11-202-80/+5
| * | | Merge "Support built-in diff drivers for hunk header function names" into sta...Matthias Sohn2024-11-2010-13/+606
| |\ \ \ | | |/ / | |/| |
| | * | Support built-in diff drivers for hunk header function namesKaushik Lingarkar2024-11-2010-13/+606
| | |/
| * / Rename numberOfPackFilesAfterBitmap to numberOfPackFilesSinceBitmapJacek Centkowski2024-11-122-11/+11
| |/
* | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-11-114-23/+206
|\|
| * Replace custom encoder Constants#encodeASCII by JDK implementationMatthias Sohn2024-11-091-7/+13
| * Replace custom encoder `Constants#encode` by JDK implementationMatthias Sohn2024-11-091-12/+1
| * Add `numberOfPackFilesAfterBitmap` to RepoStatisticsJacek Centkowski2024-11-072-1/+185
| * Enhance CommitBuilder#parent to tolerate null parentMatthias Sohn2024-11-071-3/+7
* | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-11-059-4/+440
|\|
| * ResolveMerger: Allow setting the TreeWalk AttributesNodeProviderNasser Grainawi2024-11-052-0/+43
| * Add Union merge strategy supportNasser Grainawi2024-11-047-4/+430
* | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-10-2327-155/+157
|\|
| * Update Apache sshd to 2.14.0Matthias Sohn2024-10-1022-145/+145
| * LfsConnectionFactoryTest: remove unnecessary castMatthias Sohn2024-10-102-2/+5
| * JSchSshProtocol2Test: remove unnecessary castMatthias Sohn2024-10-102-2/+3
| * ApacheSshProtocol2Test: remove unnecessary castMatthias Sohn2024-10-102-2/+3
| * NoteMapMerger: remove unnecessary castMatthias Sohn2024-10-101-1/+1
* | Merge branch 'stable-6.10' into stable-7.0Matthias Sohn2024-09-261-3/+2
|\|
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 05:07:30 +0000