aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'stable-7.1'Matthias Sohn2024-12-069-48/+87
|\
| * Merge branch 'stable-7.0' into stable-7.1Matthias Sohn2024-12-0610-48/+95
| |\
| | * 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
* | | | TreeWalk: Make a null check before dereferencing the config variable.jackdt@google.com2024-12-051-1/+4
* | | | MergeToolTest: update expected error from the toolIvan Frade2024-12-041-1/+1
* | | | Update last jgit release version to 7.1.0.202411261347-rMatthias Sohn2024-11-271-1/+1
* | | | Remove unused API warning filtersMatthias Sohn2024-11-271-67/+0
* | | | DiffFormatter: silence non-externalized string warningsMatthias Sohn2024-11-271-1/+1
* | | | Prepare 7.2.0-SNAPSHOT buildsMatthias Sohn2024-11-2789-540/+540
* | | | Merge branch 'stable-7.1'Matthias Sohn2024-11-2789-540/+540
|\| | |
| * | | Prepare 7.1.1-SNAPSHOT buildsMatthias Sohn2024-11-2689-540/+540
| * | | JGit v7.1.0.202411261347-rv7.1.0.202411261347-rMatthias Sohn2024-11-2689-123/+123
| * | | Merge branch 'master' into stable-7.1Matthias Sohn2024-11-2624-260/+640
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'stable-7.0'Matthias Sohn2024-11-263-143/+162
|\ \ \ \ | | |/ / | |/| |
| * | | 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
* | | | | Add pack-refs command to the CLIYash Chaturvedi2024-11-2214-54/+317
* | | | | Merge "GitTimeParser: Fix multiple errorprone and style comments"Matthias Sohn2024-11-212-16/+27
|\ \ \ \ \
| * | | | | GitTimeParser: Fix multiple errorprone and style commentsIvan Frade2024-11-202-16/+27
* | | | | | Merge branch 'stable-7.0'Matthias Sohn2024-11-2112-14/+829
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
* | | | | PersonIdent: Preserve the timezone when copying with new timeIvan Frade2024-11-201-1/+2
* | | | | PersonIdent: Revert @since of #getZoneIdIvan Frade2024-11-201-2/+1
* | | | | Merge changes I3844bf1e,I05c759bdMatthias Sohn2024-11-202-43/+63
|\ \ \ \ \
| * | | | | tests/BasicTest: Use java.time constructors for PersonIdentIvan Frade2024-11-191-27/+44
| * | | | | RawParseUtils test: Use java.time to create PersonIdentsIvan Frade2024-11-191-16/+19
* | | | | | Merge "Change default similarity score to 50(%) to match git's default"Matthias Sohn2024-11-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Change default similarity score to 50(%) to match git's defaultMatthias Sohn2024-11-141-1/+1
| | | | | * Merge branch 'stable-7.0' into stable-7.1Matthias Sohn2024-11-2111-14/+762
| | | | | |\ | | | |_|_|/ | | |/| | |
| | * | | | 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