aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | * | | | | Merge branch 'stable-6.1' into stable-6.2Matthias Sohn2024-01-100-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | | | | |/ / / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.1: Checkout: better directory handling Change-Id: I2f8e5410f4962d38bc6e822b5cda42df68aef32b
| | | | | | | | * | | | Merge branch 'stable-6.0' into stable-6.1Matthias Sohn2024-01-100-0/+0
| | | | | | | | |\ \ \ \ | | | | | | | | | | |/ / | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.0: Checkout: better directory handling Change-Id: Ide9fb318b5fe413d73d73a19943c6dacdcf07f3d
| | | | | | | | | * | | Merge branch 'stable-5.13' into stable-6.0Matthias Sohn2024-01-100-0/+0
| | | | | | | | | |\ \ \ | | | | | | | | | | | |/ | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.13: Checkout: better directory handling Revert commit 170244d05977491271a1cc234583d2e5ba75145d "Checkout: better directory handling" which is the downport of the original fix Ie12864c54c9f901a2ccee7caddec73027f353111 which was done on stable-6.6. Merging this up to stable-6.6 would be a lot of work and these branches aren't maintained anymore hence revert this change here. This way the fix is available on stable-5.13 for those who still need Java 8 and everybody else should upgrade to 6.6.1 or higher. Change-Id: Iffe50a5e62c6655814265d9cc6c5c2996baa1a31
| | | | | | | | | | * | Checkout: better directory handlingThomas Wolf2023-10-2218-142/+1061
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports the upstream security fix to downstream stable-5.13 branch. (cherry picked from commit 9072103f3b3cf64dd12ad2949836ab98f62dabf1) When checking out a file into the working tree ensure that all parent directories of the file below the working tree root are actually directories and do exist before we try to create the file. When multiple files are to be checked out (or even a whole tree), this may check the same directories over and over again. Asking the file system every time for file attributes is a potentially expensive operation. As a remedy, introduce an in-memory cache of directory states for a particular check-out operation. Apply the same fix also in the ResolveMerger, which may also check out files, and also in the PatchApplier. In PatchApplier, also validate paths. Change-Id: Ie12864c54c9f901a2ccee7caddec73027f353111 Signed-off-by: Thomas Wolf <twolf@apache.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | | | | | | Silence API warningsMatthias Sohn2024-01-081-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I44084c45ed2c5e642021d1de4f37af769e4b317f
| | | * | | | | | | | | Make sure ref to prune is in packed refsFabio Ponciroli2023-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RefDirectory:pack might raise an NPE when deleting loose refs as final part of the RefDirectory.pack(). This is what the code does: 1) packed ref update: update the list of refs which will be persisted in packed-refs 2) persit packed-refs: flush on file the refs computed in #1 3) prune loose refs: prune loose refs that have been packed in #2 The code correctly locks the packed-refs file during phases 1 to 3. However, it makes the wrong assumption of considering the loose refs set as immutable between phases 1 and 3. The number and values of loose refs on the filesystem can mutate at any time whilst the RefDirectory.pack() is in progress. Assuming the contrary can lead to an NPE when retrieving refs from the mutable loose refs list during phase #3. Make sure that the ref is not null before dereferencing its object-id value. Bug: jgit-4 Change-Id: I2cd01f8a880f3c6561ad978a389ec2db45b6018b
* | | | | | | | | | | | Merge "FooterLines: handle extraction from messages without headers"Ivan Frade2024-01-093-8/+71
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | FooterLines: handle extraction from messages without headersNitzan Gur-Furman2024-01-093-8/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, long subjects of messages with no headers were treated as headers, and therefore were skipped. In a message of the form `<long subject>\n\n<footers>`, the footers would then get parsed as a message, meaning no footers were returned. After this change, the first lines are skipped only if they match any of the known headers. The first line ofter the optional headers is then assumed to be the subject line. `FooterLineTest` had a few test cases for extracting footers from messages with no headers. However, there were all with short messages, so the "skip this line" logic in `RawParseUtils` was never triggered. Added test case to catch this issue. Change-Id: I971a1dddf1a9aea094360c3c8fc3b9a8b011bbf9 Issue: Google b/287891316
* | | | | | | | | | | | Update maven pluginsMatthias Sohn2023-12-231-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - com.github.siom79.japicmp:japicmp-maven-plugin to 0.18.3 - com.github.spotbugs:spotbugs-maven-plugin to 4.8.2.0 - io.github.git-commit-id:git-commit-id-maven-plugin to 7.0.0 - org.apache.maven.plugins:maven-clean-plugin to 3.3.2 - org.apache.maven.plugins:maven-compiler-plugin to 3.12.0 - org.apache.maven.plugins:maven-dependency-plugin to 3.6.1 - org.apache.maven.plugins:maven-enforcer-plugin to 3.4.1 - org.apache.maven.plugins:maven-javadoc-plugin to 3.6.3 - org.apache.maven.plugins:maven-jxr-plugin to 3.3.1 - org.apache.maven.plugins:maven-pmd-plugin to 3.21.2 - org.apache.maven.plugins:maven-project-info-reports-plugin to 3.5.1 - org.apache.maven.plugins:maven-shade-plugin to 3.5.1 - org.apache.maven.plugins:maven-site-plugin to 4.0.0-M13 - org.apache.maven.plugins:maven-surefire-plugin to 3.2.3 - org.codehaus.mojo:build-helper-maven-plugin to 3.5.0 - org.cyclonedx:cyclonedx-maven-plugin to 2.7.10 - org.eclipse.cbi.maven.plugins:eclipse-jarsigner-plugin to 1.4.3 - org.jacoco:jacoco-maven-plugin to 0.8.11 Change-Id: Ie146085f567f0bcfe0124627939382fe5a764e6c
* | | | | | | | | | | | Update org.eclipse.dash:license-tool-plugin to 1.1.0Matthias Sohn2023-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I039e10fc6790d54c30cfd85a53c05604351996e0
* | | | | | | | | | | | Enable using slf4j 2.xMatthias Sohn2023-12-229-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse platform moved to sfl4j 2.x. Hence relax version constraint so that both 1.7 and 2.x are allowed. Bug: egit-5 Change-Id: Ie0b00310d8f3f2553457c8668a38978a67b8febe
* | | | | | | | | | | | Update Tycho to 4.0.4Matthias Sohn2023-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d087b5a62ab3d474d894a2276572156c14dad4e
* | | | | | | | | | | | Update mockito to 5.8.0Matthias Sohn2023-12-2218-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70d33b7af25fcb4754fb048dd9054eef7356f00c
* | | | | | | | | | | | Add 4.31 target platform and update orbit to 4.31Matthias Sohn2023-12-2220-48/+355
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and update bytebuddy to 1.14.10. Change-Id: I145776a31d806f7e6dcc90263650109b3eb19067
* | | | | | | | | | | | Update ecj to 3.36.0Matthias Sohn2023-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I803de19e8086239ebbae9877121946fdddfbaa89
* | | | | | | | | | | | Renormalize line endings based on .gitattributesMatthias Sohn2023-12-229-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes line endings of all text files to use LF in the repository. Change-Id: I4df6fd7aaf9db9cdaa953a0d1062981b4612056c
* | | | | | | | | | | | Configure .gitattributes to manage line endingsMatthias Sohn2023-12-221-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark test resources as binary to prevent line ending normalization Some of the test resources are used to test handling of line endings in JGit. Change-Id: Idd9ba604945797d1cd1f3af1a1987aee3188e1d6
* | | | | | | | | | | | Normalize line endings to LF for all text filesMatthias Sohn2023-12-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I69753494e4c7db4c0a8e6eca3b3e63d3ff561117
* | | | | | | | | | | | Merge "Remove invalid spotbugs configuration"Matthias Sohn2023-12-221-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove invalid spotbugs configurationMichael Keppler2023-12-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * findbugsXmlOutput was renamed to spotbugsXmlOutput long ago * spotbugsXmlOutput has a default value of true and is deprecated, therefore removing the entire line seems most reasonable See https://spotbugs.github.io/spotbugs-maven-plugin/check-mojo.html#spotbugsXmlOutput Change-Id: I83c0bbce1fb3622accb13978319b4313b0121655
* | | | | | | | | | | | | Merge "Fix PMD plugin configuration"Matthias Sohn2023-12-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix PMD plugin configurationMichael Keppler2023-12-171-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configuration element has been renamed in release 3.18, see https://github.com/apache/maven-pmd-plugin/releases/tag/maven-pmd-plugin-3.18.0 Change-Id: Ia6ec6992c4348d77d4b61f34190a57775cc30cec
* | | | | | | | | | | | | BasePackFetchConnection: Skip object/ref lookups if local repo is emptyDariusz Luksza2023-12-201-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cloning repository some of the operations in `BasePackFetchConnection` can be skipped. We don't need to advertise packs, compute "wanted time" or wanted refs to send. All of those operations will try to read objects from an empty repository which always results in a missing object. This saves 99.9% of `LooseObjects.open()` calls which dramatically speeds up object negotiation in V2 protocol. In testing on JGit (v6.8.0.202311291450-r) repository, which contains 564 refs, the number of calls to `LooseObjects.open()` was reduced from 1187 to 1. Skipping a call to `markRefsAdvertised()` initially reduced be above number to 623. Then assuming "0" "want time" an on empty repository pushed the calls down to 312. Finally, skipping objects reachability on empty repository set calls down to 1. The last call is performed from `FetchProcess.asForIsComplete()` which probably needs to stay in place. Bug: jgit-5 Change-Id: I2480690726ea54d3b1593380bc8f8d15b4d6afc6
* | | | | | | | | | | | | LooseObjects: Use File#exists when possibleDariusz Luksza2023-12-201-0/+3
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `trustFolderStat` flag is enabled we can use `File.exist()` instead of rethrowing `FileNotFoundException`. This improves performance of cloning and fetching. A simple benchmark that generates a random `ObjectId` instance and then tries to parse that object id, shows about 30% improvement with this change. The benchmark scenario was based on the stacktrace reported in jgit-5. Where `RevWalk.parse()` call will eventually call `LooseObjects.open()` and finally `LoseObjects.getOpenLoader()`. Results on `master`: (packFiles) Mode Cnt Score Error Units 10 avgt 2 137.400 us/op 100 avgt 2 1369.063 us/op 1000 avgt 2 13730.759 us/op 10000 avgt 2 137359.539 us/op 100000 avgt 2 1382627.641 us/op With this change: (packFiles) Mode Cnt Score Error Units 10 avgt 2 85.019 us/op 100 avgt 2 868.748 us/op 1000 avgt 2 8628.768 us/op 10000 avgt 2 86877.505 us/op 100000 avgt 2 863123.868 us/op Issue: jgit-5 Change-Id: I366acf629873a5c7577a1032490faf57685f98dd
* | | | | | | | | | | | DfsReader: give subclasses visiblity over the pack bitmap indexIvan Frade2023-12-141-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subclasses intercept many methods in DfsReader to capture metrics, but they cannot record stats from PackBitmapIndex, as it is wrapped inside a BitmapIndex. Move the creation of the BitmapIndex to a protected method. Subclasses can override it to e.g. read metrics from the index or set listeners to the BitmapIndex. Change-Id: I86c13b3ef88663d7faf59f2ec77df0a36b1627ed
* | | | | | | | | | | | PackBitmapIndex/StoredBitmap: Expose size and countsIvan Frade2023-12-145-1/+295
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PackBitmapIndex holds a collection of StoredBitmaps. StoredBitmaps can be either base bitmaps (ready) or an XOR over another bitmap. XOR bitmaps are replaced with a resolved version on demand. Bitmaps can use a significant amount of memory but we don't have detailed visibility about it. Add methods to PackBitmapIndex to know how many xor/bases we have and their sizes. Change-Id: I57aa80a1f07ddf9223eb34cfda85aab85529ea9c
* | | | | | | | | | | | PackWriter/Statistics: Remove the bitmapt hit statsIvan Frade2023-12-133-45/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The request uses bitmaps for reachability and to decide what to pack. Setting the listener in the PackWriter only covers the second case. Remove the listener from the PackWriter. It makes more sense to set it in the reader and at the moment the BitmapIndex only supports a single listener. This was introduced after the 6.8 tag, so it should be safe to remove. Change-Id: Ib4c0a805c70e54b6a9e7f78ccdb8e0a465d238f1
* | | | | | | | | | | | Configure Github issue reportingThomas Wolf2023-12-102-0/+93
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two forms for bug reports and feature requests. Change-Id: I8d80f2498741ba5bb88655d1e22798f99826fb7f
* | | | | | | | | | | Merge "API filter for PackStatistics.objectsWithBitmapsFound"Thomas Wolf2023-12-061-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | API filter for PackStatistics.objectsWithBitmapsFoundThomas Wolf2023-12-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The field was introduced in commit 5e563e1b. Change-Id: Ic2f495e79319ac6044bcabf253b63b8b631eec84
* | | | | | | | | | | | FooterLine: Protect from ill-formed messageKamil Musin2023-12-052-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A raw commit message has some headers and then the actual message. RawParseUtils.commitMessage returns the start position of the actual message, or -1 when the message is not raw. FooterLine is not handling this -1 and throws an IndexOutOfBounds exception. Consider than msgB can be -1 when looking for the beginning of the last paragraph. FooterLine javadoc and parameter talk only about "raw" but previous code accepted non-raw messages (used mostly in unit tests) so we need to keep this behavior. Change-Id: I4b88c507e210fdd200a85b01665c8524ab393b00
* | | | | | | | | | | | Merge "Document option gc.writeCommitGraph"Ivan Frade2023-12-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Document option gc.writeCommitGraphMatthias Sohn2023-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic02d5abce18250b30f2c3f3741892d8cda251001
* | | | | | | | | | | | Merge "StartGenerator: Fix parent rewrite with non-default RevFilter"Ivan Frade2023-12-044-24/+123
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | StartGenerator: Fix parent rewrite with non-default RevFilterRonald Bhuleskar2023-12-044-24/+123
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StartGenerator is responsible for propagating the RevWalk's parent rewrite setting, but it currently only does so when a non-default TreeFilter is set, when it should also do so if the default TreeFilter is used with a non-default RevFilter. Adding a new if condition within StartGenerator to enable parent rewrite with non-default RevFilter. TreeRevFilter relied on the old buggy functionality and has been modified to explicitly refrain from rewriting parents. Change-Id: I4e4ff67fb279edbcc3461496b132cea774fb742f
* / / / / / / / / / / / Update MANIFEST.MFPeter Kriens2023-12-041-1/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an import for javax.net.ssl Signed-off-by: Peter Kriens <Peter.Kriens@aQute.biz>
* | | | | | | | | | | Bump last release version to 6.8.0.202311291450-rMatthias Sohn2023-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the version used to compare API changes against to detect breaking API changes. Change-Id: I005b6a24c98c507656ebab415492a4127f08d471
* | | | | | | | | | | Prepare 6.9.0-SNAPSHOT buildsMatthias Sohn2023-12-0491-536/+536
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id1d784ec4870cfb53c4b140fe0bb3fad9eef651d
* | | | | | | | | | | Merge branch 'stable-6.8'Matthias Sohn2023-12-04111-573/+591
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-6.8: Prepare 6.8.1-SNAPSHOT builds JGit v6.8.0.202311291450-r Rename method parameter to fix warning about hidden field Fix warnings about empty control flow statements BitmapIndexImpl: externalize error message Suppress not-externalized string warnings Silence API error for new method BitmapIndex#addBitmapLookupListener Update Orbit to orbit-aggregation/2023-12 Prepare 6.8.0-SNAPSHOT builds JGit v6.8.0.202311212206-rc1 Change-Id: Ie88662f6458bb80147c7c164424eebd8b8240fc7
| * | | | | | | | | | Prepare 6.8.1-SNAPSHOT buildsMatthias Sohn2023-11-2991-536/+536
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56458c5345dcd9544868c948e90c9827d25c6850
| * | | | | | | | | | JGit v6.8.0.202311291450-rv6.8.0.202311291450-rMatthias Sohn2023-11-2991-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Iecfe3f628cfdc437ee0d63fe52653ef952c8c494
| * | | | | | | | | | Rename method parameter to fix warning about hidden fieldMatthias Sohn2023-11-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id094ab022f82db0f3eb220052adc0aed1cde2d50
| * | | | | | | | | | Fix warnings about empty control flow statementsMatthias Sohn2023-11-291-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1595ac148edf88a18efdd90c4f40d0ac719caab
| * | | | | | | | | | BitmapIndexImpl: externalize error messageMatthias Sohn2023-11-293-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5189e966aecc57fe7c3e6c3f7f8e6b16917ee27f
| * | | | | | | | | | Suppress not-externalized string warningsMatthias Sohn2023-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2a0a588227d451cb175e17eef20ecb6fe9e9ef80
| * | | | | | | | | | Silence API error for new method BitmapIndex#addBitmapLookupListenerMatthias Sohn2023-11-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it has an empty default implementation. Change-Id: I56b16c48992652a4ddaaf4c0435e08452c65749e
| * | | | | | | | | | Update Orbit to orbit-aggregation/2023-12Matthias Sohn2023-11-2815-29/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifde28f60461e0a9d7b1278f8f178ceb2c4e1db7a
| * | | | | | | | | | Merge branch 'master' into stable-6.8Matthias Sohn2023-11-2713-143/+272
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Adapt to type parameter added in commons-compress 1.25.0 Improve footer parsing to allow multiline footers. Make the tests buildable by bazel test BitmapIndex: Add interface to track bitmaps found (or not) BitmapWalker: Remove BitmapWalkListener Change-Id: Id2aeb0acd37bdd68a2f2c9f09f4d442fa40c9dd1
| * | | | | | | | | | | Prepare 6.8.0-SNAPSHOT buildsMatthias Sohn2023-11-2291-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I89178175549541111cddb88da401899960c0ecac
| * | | | | | | | | | | JGit v6.8.0.202311212206-rc1v6.8.0.202311212206-rc1Matthias Sohn2023-11-2191-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I6a40cdef68538fa769f4525eb2ff1ed4a810f11c
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-17 14:14:00 +0000