aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prepare 5.3.1-SNAPSHOT buildsMatthias Sohn2019-03-1368-425/+425
| | | | | Change-Id: I8dc5e47bd19809d684579610edf922abca3cb3cc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v5.3.0.201903130848-rv5.3.0.201903130848-rMatthias Sohn2019-03-1368-89/+89
| | | | | Change-Id: I52256a6d07011030698299d9a97dd01ea825fb7f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-5.2' into stable-5.3Matthias Sohn2019-03-136-87/+99
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.2: Prepare 5.1.7-SNAPSHOT builds JGit v5.1.6.201903130242-r Prepare 4.11.8-SNAPSHOT builds JGit v4.11.7.201903122105-r Prepare 4.9.10-SNAPSHOT builds JGit v4.9.9.201903122025-r Prepare 4.7.9-SNAPSHOT builds JGit v4.7.8.201903121755-r Prepare 4.5.7-SNAPSHOT builds JGit v4.5.6.201903121547-r Check for packfile validity and fd before reading Move throw of PackInvalidException outside the catch Use FileSnapshot to get lastModified on PackFile Include size when comparing FileSnapshot Do not reuse packfiles when changed on filesystem Silence API warnings for new API introduced for fixes Change-Id: Ia866587a910e620cb297bcb2a81fe0786f4e3db2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge branch 'stable-5.1' into stable-5.2Matthias Sohn2019-03-136-79/+99
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Prepare 5.1.7-SNAPSHOT builds JGit v5.1.6.201903130242-r Prepare 4.11.8-SNAPSHOT builds JGit v4.11.7.201903122105-r Prepare 4.9.10-SNAPSHOT builds JGit v4.9.9.201903122025-r Prepare 4.7.9-SNAPSHOT builds JGit v4.7.8.201903121755-r Prepare 4.5.7-SNAPSHOT builds JGit v4.5.6.201903121547-r Check for packfile validity and fd before reading Move throw of PackInvalidException outside the catch Use FileSnapshot to get lastModified on PackFile Include size when comparing FileSnapshot Do not reuse packfiles when changed on filesystem Silence API warnings for new API introduced for fixes Change-Id: I8da2761ed27ff2817a4136f843b9b293e3c0f4e6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * Prepare 5.1.7-SNAPSHOT buildsMatthias Sohn2019-03-1356-357/+357
| | | | | | | | | | | | | | | Change-Id: Ica716b2ad18f8390e75466430ef81c86ea06f004 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * JGit v5.1.6.201903130242-rv5.1.6.201903130242-rMatthias Sohn2019-03-1356-59/+59
| | | | | | | | | | | | | | | Change-Id: Iaf5e451f72dc8512afee99a9f3fb91aa348e3cf5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * Merge branch 'stable-5.0' into stable-5.1Matthias Sohn2019-03-136-13/+99
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Prepare 4.11.8-SNAPSHOT builds JGit v4.11.7.201903122105-r Prepare 4.9.10-SNAPSHOT builds JGit v4.9.9.201903122025-r Prepare 4.7.9-SNAPSHOT builds JGit v4.7.8.201903121755-r Prepare 4.5.7-SNAPSHOT builds JGit v4.5.6.201903121547-r Check for packfile validity and fd before reading Move throw of PackInvalidException outside the catch Use FileSnapshot to get lastModified on PackFile Include size when comparing FileSnapshot Do not reuse packfiles when changed on filesystem Silence API warnings for new API introduced for fixes Change-Id: I71771dcc086a9a0097bad74d65ec71ad97106a38 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2019-03-136-13/+97
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Prepare 4.11.8-SNAPSHOT builds JGit v4.11.7.201903122105-r Prepare 4.9.10-SNAPSHOT builds JGit v4.9.9.201903122025-r Prepare 4.7.9-SNAPSHOT builds JGit v4.7.8.201903121755-r Prepare 4.5.7-SNAPSHOT builds JGit v4.5.6.201903121547-r Check for packfile validity and fd before reading Move throw of PackInvalidException outside the catch Use FileSnapshot to get lastModified on PackFile Include size when comparing FileSnapshot Do not reuse packfiles when changed on filesystem Silence API warnings for new API introduced for fixes Change-Id: I04c70f66c6f1e53bdc199fb5b24c9136c9a8e4f7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * Prepare 4.11.8-SNAPSHOT buildsMatthias Sohn2019-03-1356-356/+356
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92789b0c02e83786961b81556bf2faec5d26b0c1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * JGit v4.11.7.201903122105-rv4.11.7.201903122105-rMatthias Sohn2019-03-1356-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4fc62c304b5a8452ca72a3b305e5732a26120000 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2019-03-136-13/+97
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Prepare 4.9.10-SNAPSHOT builds JGit v4.9.9.201903122025-r Prepare 4.7.9-SNAPSHOT builds JGit v4.7.8.201903121755-r Prepare 4.5.7-SNAPSHOT builds JGit v4.5.6.201903121547-r Check for packfile validity and fd before reading Move throw of PackInvalidException outside the catch Use FileSnapshot to get lastModified on PackFile Include size when comparing FileSnapshot Do not reuse packfiles when changed on filesystem Silence API warnings for new API introduced for fixes Change-Id: Ic66dc00455c05f7627919f682a7221ffeef1629d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * Merge branch 'stable-4.9' into stable-4.10Matthias Sohn2019-03-136-13/+97
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Prepare 4.9.10-SNAPSHOT builds JGit v4.9.9.201903122025-r Prepare 4.7.9-SNAPSHOT builds JGit v4.7.8.201903121755-r Prepare 4.5.7-SNAPSHOT builds JGit v4.5.6.201903121547-r Check for packfile validity and fd before reading Move throw of PackInvalidException outside the catch Use FileSnapshot to get lastModified on PackFile Include size when comparing FileSnapshot Do not reuse packfiles when changed on filesystem Silence API warnings for new API introduced for fixes Change-Id: Ifcd8ea6a2b59f6f8e9d896d8407cfcaef0a9375d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * Prepare 4.9.10-SNAPSHOT buildsMatthias Sohn2019-03-1356-333/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2bdbe822ee623c5f15a26d092136d8602cef06ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * JGit v4.9.9.201903122025-rv4.9.9.201903122025-rMatthias Sohn2019-03-1356-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I807d24461b3557eee48294bfaa652b2a13d78113 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * Merge branch 'stable-4.8' into stable-4.9Matthias Sohn2019-03-136-13/+97
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Prepare 4.7.9-SNAPSHOT builds JGit v4.7.8.201903121755-r Prepare 4.5.7-SNAPSHOT builds JGit v4.5.6.201903121547-r Check for packfile validity and fd before reading Move throw of PackInvalidException outside the catch Use FileSnapshot to get lastModified on PackFile Include size when comparing FileSnapshot Do not reuse packfiles when changed on filesystem Silence API warnings for new API introduced for fixes Change-Id: I9a47153831f8eb10d3cd91b4157cf45385e5b13a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | * Merge branch 'stable-4.7' into stable-4.8Matthias Sohn2019-03-136-13/+97
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Prepare 4.7.9-SNAPSHOT builds JGit v4.7.8.201903121755-r Prepare 4.5.7-SNAPSHOT builds JGit v4.5.6.201903121547-r Check for packfile validity and fd before reading Move throw of PackInvalidException outside the catch Use FileSnapshot to get lastModified on PackFile Include size when comparing FileSnapshot Do not reuse packfiles when changed on filesystem Silence API warnings for new API introduced for fixes Change-Id: I1136eaa1590b225ceaf16ba7552af0374253a74e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | | * Prepare 4.7.9-SNAPSHOT buildsMatthias Sohn2019-03-1256-321/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1602a6b811fd9f95e284153b560d8d9f855fae9f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | | * JGit v4.7.8.201903121755-rv4.7.8.201903121755-rMatthias Sohn2019-03-1256-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6dbde615671ed09789326aacad1655e7a7a59ad Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | | * Merge branch 'stable-4.6' into stable-4.7Matthias Sohn2019-03-126-13/+97
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.6: Prepare 4.5.7-SNAPSHOT builds JGit v4.5.6.201903121547-r Check for packfile validity and fd before reading Move throw of PackInvalidException outside the catch Use FileSnapshot to get lastModified on PackFile Include size when comparing FileSnapshot Do not reuse packfiles when changed on filesystem Silence API warnings for new API introduced for fixes Change-Id: I3d1544d034783fe0fa1385dfe9b03ad8e9247c63 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | | | * Merge branch 'stable-4.5' into stable-4.6Matthias Sohn2019-03-126-13/+113
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.5: Prepare 4.5.7-SNAPSHOT builds JGit v4.5.6.201903121547-r Check for packfile validity and fd before reading Move throw of PackInvalidException outside the catch Use FileSnapshot to get lastModified on PackFile Include size when comparing FileSnapshot Do not reuse packfiles when changed on filesystem Silence API warnings for new API introduced for fixes Change-Id: I029e1797447e6729de68bd89d4d69b324dbb3f5f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | | | | * Prepare 4.5.7-SNAPSHOT buildsMatthias Sohn2019-03-1256-302/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5c275c542e12746c3d8ecf8462791969f9e89e12 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | | | | * JGit v4.5.6.201903121547-rv4.5.6.201903121547-rMatthias Sohn2019-03-1256-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a071ed10e1ac1ab28f992d45cde335c12556a80 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | | | | * Check for packfile validity and fd before readingLuca Milanesio2019-03-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading from a packfile, make sure that is valid and has a non-null file-descriptor. Because of concurrency between a thread invalidating a packfile and another trying to read it, the read() may result into a NPE that won't be able to be automatically recovered. Throwing a PackInvalidException would instead cause the packlist to be refreshed and the read to eventually succeed. Bug: 544199 Change-Id: I27788b3db759d93ec3212de35c0094ecaafc2434 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
| | | | | | | | | | * Move throw of PackInvalidException outside the catchLuca Milanesio2019-03-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a packfile is invalid, throw an exception explicitly outside any catch scope, so that is not accidentally caught by the generic catch-all cause, which would set the packfile as valid again. Flagging an invalid packfile as valid again would have dangerous consequences such as the corruption of the in-memory packlist. Bug: 544199 Change-Id: If7a3188a68d7985776b509d636d5ddf432bec798 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
| | | | | | | | | | * Use FileSnapshot to get lastModified on PackFileLuca Milanesio2019-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not redundantly call File.lastModified() for extracting the timestamp of the PackFile but rather use consistently the FileSnapshot which reads all file attributes in a single bulk call. Change-Id: I932675ae4fe56dcd3833dac249816f097303bb09 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | | | | * Include size when comparing FileSnapshotLuca Milanesio2019-03-125-9/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to finite filesystem timestamp resolution the last modified timestamp of files cannot detect file changes which happened in the immediate past (less than one filesystem timer tick ago). Read and consider file size also, so that differing file size can help to more accurately detect file changes without reading the file content. Use bulk read to avoid multiple stat calls to retrieve file attributes. Change-Id: I974288fff78ac78c52245d9218b5639603f67a46 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | | | | * Do not reuse packfiles when changed on filesystemLuca Milanesio2019-03-122-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pack reload mechanism from the filesystem works only by name and does not check the actual last modified date of the packfile. This lead to concurrency issues where multiple threads were loading and removing from each other list of packfiles when one of those was failing the checksum. Rely on FileSnapshot rather than directly checking lastModified timestamp so that more checks can be performed. Bug: 544199 Change-Id: I173328f29d9914007fd5eae3b4c07296ab292390 Signed-off-by: Luca Milanesio <luca.milanesio@gmail.com>
| | | | | | | | | | * Silence API warnings for new API introduced for fixesMatthias Sohn2019-03-121-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ea7ff2efd33ca6c780afaef9010cec82780d7fa Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | | | | Merge branch 'stable-5.2' into stable-5.3Matthias Sohn2019-03-121-26/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.2: Reduce contention on PackFile.idx() function. Change-Id: I6bf4c1db695b8fa134ea425bbd488d2dc5438152 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | | | Merge branch 'stable-5.1' into stable-5.2Matthias Sohn2019-03-121-26/+35
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.1: Reduce contention on PackFile.idx() function. Change-Id: I3f981dd923209e4d2d23f3b10db9fda1e9e68104 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | | Merge branch 'stable-5.0' into stable-5.1Matthias Sohn2019-03-121-26/+35
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Reduce contention on PackFile.idx() function. Change-Id: Ic50f375faa757076e2dfd6c25e9e0025482aa3d9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | | | | | Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2019-03-121-26/+35
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Reduce contention on PackFile.idx() function. Change-Id: Ib1be8c04c9587c595f7d95df26f7be9b237bda40 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | | | | | | Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2019-03-121-26/+35
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Reduce contention on PackFile.idx() function. Change-Id: I5dd7576018ab2e85d77d336f97c8e77ad71520c9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * | | | | | Merge branch 'stable-4.9' into stable-4.10Matthias Sohn2019-03-121-26/+35
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Reduce contention on PackFile.idx() function. Change-Id: I277e53aa752c8ffb8560de710d27ecb58871ec02 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * | | | | Reduce contention on PackFile.idx() function.Juergen Denner2019-03-111-26/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of concurrent pack file access, threads may wait on the idx() function even for already open files. This happens especially with a slow file system. Performance numbers are listed in the bug report. Bug: 543739 Change-Id: Iff328d347fa65ae07ecce3267d44184161248978 Signed-off-by: Juergen Denner <j.denner@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | | | | Use SystemReader in JSchConfigSessionFactoryTestMatthias Sohn2019-03-111-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isolates the test from the concrete system it's running on. SshSessionFactory reads the user also through SystemReader. Change-Id: I1c796aa1c498fe3967456d8589e6be0a82ab8f44 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | | | | Avoid NPE in ObjectId.isId()Michael Keppler2019-03-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That method can easily be invoked with a null argument (e.g. isId(repo.getFullBranch()), therefore it should handle null arguments. Change was suggested in https://git.eclipse.org/r/#/c/137918/, which tried to fix the same in egit only. Bug:544982 Change-Id: I32d1df6e9b2946ab324eda7008721159019316b3 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
* | | | | | | | | | | Prepare 5.3.0-SNAPSHOT buildsMatthias Sohn2019-03-0668-89/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b934bcfad3d2091f4da163170348b0c8ef5e732 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | | | | JGit v5.3.0.201903061415-rc1v5.3.0.201903061415-rc1Matthias Sohn2019-03-0668-89/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85866af97fe1c0c0a0da83a7605484082fa56b52 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | | | | Merge branch 'master' into stable-5.3Matthias Sohn2019-03-06126-1707/+2825
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Update Orbit to R20190226160451 Upgrade maven-javadoc-plugin to 3.1.0 diff: add option metaVar for --src-prefix and --dst-prefix ResolveMerger: Destroy TemporaryBuffer on unchecked exceptions Expose the filter blob limit in UploadPack Upgrade error_prone_core to 2.3.3 On Windows use %APPDATA%\gnupg as GPG directory if it exists Remove duplicate externalized message RebaseCommand: tighten check for --preserve-merges on --continue RebaseCommand: fix ONTO_NAME, and --preserve-merges is interactive RebaseCommand: use orig-head to abort Fix core.autocrlf for non-normalized index RebaseCommand: use orig-head in addition to head SHA1: Use externalized message in log JGitText: Remove unnecessary suffix from externalized message identifier FS_POSIX: Externalize log message Strongly reference indices in DfsPackFile Update Orbit to S20190219190953 Update README Update README Add missing @since tag for new API method getUpdateIndex Fix NPE in PlotCommitList CommitBuilder: Deprecate setEncoding(String) CommitBuilder: Add missing periods on methods' Javadoc Upgrade wagon-ssh to 3.3.2 Fix bug in copyPackBypassCache's skip 'PACK' header logic Upgrade spotbugs to 3.1.11 Atomic file creation: hard-linking may not be allowed Update Orbit to S20190129210011 Fix GC.deleteEmptyRefsFolders Enable cloning only specific tags Delete jgit-4.5 target platform Add 4.11-staging target platform and update Orbit to I20190123233226 Upgrade jacoco-maven-plugin to 0.8.3 Bazel: Format BUILD file with buildifier RenameBranchCommand: more consistent handling of short ref names SshdSessionFactory: generalize providing default keys Allow to check for signing key Handle premature EOF in BundleFetchConnection pgm: Fix missing braces in Version.run() pgm: Handle IOException in Version command pgm: Fix missing braces in UploadPack.run() pgm: Handle IOException in UploadPack command pgm: Handle exceptions in Tag command pgm: Fix missing braces in Status.run() pgm: Handle exceptions in Status command pgm: Fix missing braces in ShowRef.run() pgm: Handle IOException in ShowRef command pgm: Fix missing braces in Show.run() pgm: Handle exceptions in Show command pgm: Fix missing braces in Rm command pgm: Handle GitAPIException in Rm command pgm: Handle exceptions in RevParse command pgm: Externalize error message pgm: Fix missing braces in Reset.run() pgm: Handle GitAPIException in Reset command pgm: Handle GitAPIException in Repo command pgm: Handle exceptions in Remote command pgm: Handle exceptions in Reflog command pgm: Handle IOException in ReceivePack command SmartClientSmartServerTest: Open Repository in try-with-resource SmartClientSmartServerTest: Open ObjectInserter.Formatter in try-with-resource SmartClientSmartServerTest#addBrokenContext: Remove unused TestRepository IO: Open TemporaryBuffer.Heap in try-with-resource GitSmartHttpTools: Open SideBandOutputStream in try-with-resource TemporaryBufferTest: Open TemporaryBuffer in try-with-resource Scanner: Open RevWalk in try-with-resource SubmoduleWalkTest: Open Repository in try-with-resource SideBandOutputStreamTest: Open SideBandOutputStream in try-with-resource UnionInputStreamTest: Open UnionInputStream in try-with-resource Merge: Avoid non-localised literal string warning for "recursive" pgm: Fix missing braces in Push.run() pgm: Handle exceptions in Push command pgm: Fix missing braces in MergeBase.run() pgm: Handle IOException in MergeBase command pgm: Fix missing braces in Merge command pgm: Handle exceptions in Merge command pgm: Fix missing braces in LsTree.run() pgm: Handle exceptions in LsTree command pgm: Fix missing braces in LsRemote.run() pgm: Handle exceptions in LsRemote command pgm: Handle exceptions in LsFiles command pgm: Fix missing braces in Log.run() pgm: Handle exceptions in Log command pgm: Handle exceptions in Init command pgm: Handle IOException in IndexPack command pgm: Fix missing braces in Fetch.run() pgm: Handle IOException in Fetch command pgm: Handle GitAPIException in Gc command pgm: Fix missing braces in DiffTree.run() pgm: Handle exceptions in DiffTree command pgm: Fix missing braces in Diff.run() pgm: Handle exceptions in Diff command RawParseUtils: Avoid import of java.nio.charset.StandardCharsets Consistently import constants from StandardCharsets as static LocalDiskRepositoryTestCase#createRepository: Default auto-close to false UploadPack: Suppress false-positive resource leak warning PushConnectionTest: Open TestRepository in try-with-resource MergerTest: Open TestRepository in try-with-resource MergeCommandTest: Open TestRepository in try-with-resource PackWriterTest: Open TestRepository in try-with-resource ReceivePackAdvertiseRefsHookTest: Open TestRepository in try-with-resource SubmoduleStatusTest: Open TestRepository in try-with-resource UploadPackTest: Open TestRepository in try-with-resource PackParserTest: Open TestRepository in try-with-resource SmartClientSmartServerTest: Open TestRepository in try-with-resource Stop using deprecated methods of RemoteSetUrlCommand/RemoteRemoveCommand SmartClientSmartServerTest: Stop using deprecated Repository#hasObject DumbClientSmartServerTest: Open TestRepository in try-with-resource DumbClientDumbServerTest: Open TestRepository in try-with-resource DirCacheCheckoutTest: Open TestRepository in try-with-resource HttpTestCase#fsck: Open TestRepository in try-with-resource CheckoutCommandTest: Add comment to document intentionally empty catch block pgm: Fix missing braces in Describe.run() pgm: Handle exceptions in Describe command pgm: Handle exceptions in Config command pgm: Fix too wide lines in Commit.run() pgm: Fix missing braces in Commit.run() pgm: Handle exceptions in Commit command pgm: Handle exceptions in Clean command pgm: Handle GitAPIException in Fetch command Fix missing braces in Branch.run() pgm: Handle exceptions in Branch command Fix missing braces in Blame.run() pgm: Handle NoWorkTreeException and IOException in Blame command Use try-with-resource for reader in Blame.run() pgm: Handle GitAPIException in Add command Change-Id: I6d546885beb9596120e201973995a7c6bfe115e0
| * | | | | | | | | | | Update Orbit to R20190226160451Matthias Sohn2019-03-0613-27/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I43bfd56b029b4bf16aaf001915a9dabeb189a9e2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | | | | Merge "Upgrade maven-javadoc-plugin to 3.1.0"Matthias Sohn2019-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Upgrade maven-javadoc-plugin to 3.1.0David Pursehouse2019-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4fc59b02e92db55797b9773648fd1dea88682ade Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | | | | | | | | Merge "Merge branch 'stable-5.2'"Matthias Sohn2019-03-056-12/+71
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'stable-5.2'David Pursehouse2019-03-056-12/+71
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.2: Fix error log message in ObjectDirectory.handlePackError() Properly format pack checksums in PackFile.idx() Cancel gc if thread was interrupted PackFile: report correct message for checksum mismatch ObjectDirectory: Clean up logging Bazel: Stop using native.git_repository Change-Id: Ib972641105cef8089791fc65389c4f43e218620a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | \ \ \ \ \ \ \ \ \ \ \ Merge "diff: add option metaVar for --src-prefix and --dst-prefix"Christian Halstrick2019-03-052-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | diff: add option metaVar for --src-prefix and --dst-prefixAndre Bossert2019-03-042-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes exception if using "jgit diff --help". Bug: 544735 Change-Id: I694ff3103da4bc199dd03c40962c5be191eddcd1 Signed-off-by: Andre Bossert <andre.bossert@siemens.com>
| * | | | | | | | | | | | | ResolveMerger: Destroy TemporaryBuffer on unchecked exceptionsDave Borowitz2019-03-011-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called destroy() to delete the temp file on failure only when catching an IOException, not a RuntimeException. Use a slightly different construction with a finally block to ensure it's always deleted on error (assuming the JVM is still healthy enough). Change-Id: Ie201f3cfc81099ee1cafed066632da76223cef1f
| * | | | | | | | | | | | | Expose the filter blob limit in UploadPackTerry Parker2019-02-281-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to UploadPack.getDepth() to know the shallow clone depth, expose the user-specified filter blob limit for partial clones. Change-Id: I04bde06862a1cf8a9862d950c15023c49d16a2a6 Signed-off-by: Terry Parker <tparker@google.com>
| * | | | | | | | | | | | | Upgrade error_prone_core to 2.3.3David Pursehouse2019-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31232d09b6dc1e5bb3d3398d34b3dd814165d2dc Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-02 18:49:50 +0000