summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add response message, if any, on HTTP status 404Thomas Wolf2018-07-034-9/+24
| | | | | | | | | Try to give as much information as possible. The connection's response message might contain additional hints as to why the connection could not be established. Bug: 536541 Change-Id: I7230e4e0be9417be8cedeb8aaab35186fcbf00a5 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* Upgrade spotbugs-maven-plugin to 3.1.5David Pursehouse2018-06-291-1/+1
| | | | | Change-Id: I00e255adb3e14f4046f7eeb4fcc2a344bb7bda9d Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Merge "Return parsed objects from TestRepository.commit/tree/blob()"Terry Parker2018-06-285-122/+129
|\
| * Return parsed objects from TestRepository.commit/tree/blob()Terry Parker2018-06-285-122/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | It is convenient for TestRepository to return fully parsed objects from its commit()/tree()/blob() methods, so that test code doesn't have to remember to parse them before making assertions about them. Update TestRepostiory to return fully parsed objects. Adjust the tests that are affected by this change in behavior. Change-Id: I09d03d0c80ad22cb7092f4a2eaed99d40a10af63 Signed-off-by: Terry Parker <tparker@google.com>
* | Update .mailmapDavid Pursehouse2018-06-271-0/+1
|/ | | | | Change-Id: I9bd776e3d1ae120d56d6ee2f8eec9a5d80aa38cc Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Correctly handle initialization of shallow commitsTerry Parker2018-06-263-13/+58
| | | | | | | | | | | | | | | | | | | | | In a new RevWalk, if the first object parsed is one of the shallow commits, the following happens: 1) RevCommit.parseCanonical() is called on a new "r1" RevCommit. 2) RevCommit.parseCanonical() immediately calls RevWalk.initializeShallowCommits(). 3) RevWalk.initializeShallowCommits() calls lookupCommit(id), creating and adding a new "r2" version of this same object and marking its parents empty. 4) RevCommit.parseCanonical() initializes the "r1" RevCommit's fields, including the parents. 5) RevCommit.parseCanonical()'s caller uses the "r1" commit that has parents, losing the fact that it is a shallow commit. This change passes the current RevCommit as an argument to RevWalk.initializeShallowCommits() so that method can set its parents empty rather than creating the duplicate "r2" commit. Change-Id: I67b79aa2927dd71ac7b0d8f8917f423dcaf08c8a Signed-off-by: Terry Parker <tparker@google.com>
* Merge changes Ib6019b10,I82c71b52Terry Parker2018-06-262-233/+298
|\ | | | | | | | | | | * changes: Fix a GC scalability issue when selecting commit bitmaps Test uniform bitmap commit selection across multiple branches
| * Fix a GC scalability issue when selecting commit bitmapstparker2018-06-261-227/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous algorithm selected commits by creating bitmaps at each branch tip, doing a revwalk to populate each bitmap, and looping in this way: 1) Select the remaining branch with the most commits (the branch whose bitmap has the highest cardinality) 2) Select well-spaced bitmaps in that branch 3) Remove commits in the selected branch from the remaining branch-tip bitmaps 4) Repeat at #1 This algorithm gave good commit selection on all branches but a more uniform selection on "important" branches, where branch length is the proxy for "important". However the algorithm required N bitmaps of size M solely for the purpose of commit selection, where N is the number of branch tips in the primary GC pack, and M is the number of objects in the pack. This new algorithm uses branch modification date as the proxy for "important" branches, replacing the N*M memory allocation with a single M-sized bitmap and N revwalks from new branch tips to shared history (which will be short when there is a lot of shared history). GcCommitSelectionTest.testDistributionOnMultipleBranches verifies that this algorithm still yields good coverage on all branches. Change-Id: Ib6019b102b67eabb379e6b85623e4b5549590e6e Signed-off-by: Terry Parker <tparker@google.com>
| * Test uniform bitmap commit selection across multiple branchestparker2018-06-261-6/+101
| | | | | | | | | | | | | | | | Test that the commit selection algorithm provides appropriate coverage across all branches. Change-Id: I82c71b52068f01e8cef2398aecfec8e144d9a68b Signed-off-by: Terry Parker <tparker@google.com>
* | CleanCommand: don't fire WorkingTreeModifiedEvent on dry runThomas Wolf2018-06-261-1/+1
| | | | | | | | | | | | | | Since no files are actually deleted it makes no sense to fire such an event. Change-Id: I66e87afc1791f27fddaa873bafe8bb8b61662535 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | Merge branch 'stable-5.0'Matthias Sohn2018-06-242-1/+39
|\ \ | |/ |/| | | | | | | | | | | | | | | * stable-5.0: Prepare 5.0.2-SNAPSHOT builds JGit v5.0.1.201806211838-r Add project-info reports to maven site Fix maven site generation failing with javadoc errors Change-Id: Iedbc4c777a6e724f487419e187e25cf7e3aa55d6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge branch 'stable-4.11' into stable-5.0David Pursehouse2018-06-230-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Empty merge because of previous merge from stable-4.9 into stable-5.0 and commits subsequently merged into stable-4.10 and stable-4.11. Change-Id: I69b8d3e96173ef58b77186dfe462148075954ce4 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * Merge branch 'stable-4.10' into stable-4.11David Pursehouse2018-06-220-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Temporarily @Ignore flaky CommitCommandTest methods Change-Id: I9902553ac442821416912d26a5d6ee1b0dc41cf4 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | * Merge branch 'stable-4.9' into stable-4.10David Pursehouse2018-06-210-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Temporarily @Ignore flaky CommitCommandTest methods Change-Id: I5f256aa6117847a25ab9e15c7d7ccc51e43cbb64 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | Prepare 5.0.2-SNAPSHOT buildsMatthias Sohn2018-06-2256-357/+357
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I65e83f39a4082278c4cb809dbb08d44a119cebe0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | JGit v5.0.1.201806211838-rv5.0.1.201806211838-rMatthias Sohn2018-06-2256-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I594cd85d46698953c27da3687e4ec40aeb73b445 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | Add project-info reports to maven siteMatthias Sohn2018-06-211-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I290d9c4a27d2ca1b9071f39639195e0d85799c00 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | Fix maven site generation failing with javadoc errorsMatthias Sohn2018-06-212-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same errors are suppressed when generating javadoc. Suppress the errors during site generation. Change-Id: I83bd1c10e5de82f47c351e7edf2c9230be4b1f21 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | Merge branch 'stable-5.0'Jonathan Nieder2018-06-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Respect "unshallow" lines in protocol v2 Temporarily @Ignore flaky CommitCommandTest methods Change-Id: I14bd522d2f6bafb1b41e3c730d6dbef827e3e88a Signed-off-by: Jonathan Nieder <jrn@google.com>
| * | | | Respect "unshallow" lines in protocol v2Jonathan Nieder2018-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If I run git config --global protocol.version 2 mkdir repo cd repo git init --bare git remote add origin https://go.googlesource.com/proposal git fetch --depth=1 git fetch --unshallow then I expect to have a full history, just as though I had fetched without --depth in the first place. Instead, it reports success but does not fetch enough objects: $ git fsck notice: HEAD points to an unborn branch (master) Checking object directories: 100% (256/256), done. Checking objects: 100% (468/468), done. broken link from commit 2c6bc83f234085c8eadb7ea33405ce6223c44d1b to commit 878975cf2b600675b4c905e5d9591bd24541ae9e missing commit 878975cf2b600675b4c905e5d9591bd24541ae9e dangling commit 314be00dae78dd526851f5635e6349014e2ad0c2 The false success indicates problems in the client and the server. Git 2.18-rc2 (the client) ought to have been more defensive, noticing the incomplete history. The greater error is in JGit (the server), which neglects to send the objects requested. When serving protocol v0 requests, JGit sends the correct objects by taking unshallowCommits into account when generating the pack to send to the client. Do the same in the protocol v2 code path. I forgot to do this in v5.0.0.201806050710-rc3~6 (Teach UploadPack shallow fetch in protocol v2, 2018-03-15). Reported-by: Russ Cox <rsc@golang.org> Change-Id: I282b45f47616a641b9e8d6210b4a070d3efdbb9b Signed-off-by: Jonathan Nieder <jrn@google.com>
| * | | | Merge branch 'stable-4.9' into stable-5.0David Pursehouse2018-06-200-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Temporarily @Ignore flaky CommitCommandTest methods Change-Id: I2db9bf014ba222d77851cc58da7ee5a0e8b344f6 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | | Merge branch 'stable-4.8' into stable-4.9David Pursehouse2018-06-200-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Temporarily @Ignore flaky CommitCommandTest methods Change-Id: I318813d19445ab7c44384015d36830ed02b8b590 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | * \ \ Merge branch 'stable-4.7' into stable-4.8David Pursehouse2018-06-201-0/+3
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Temporarily @Ignore flaky CommitCommandTest methods Change-Id: I016c9b3ec0081542bb903f361d9a3af1ea746ae3 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | * \ \ Merge branch 'stable-4.6' into stable-4.7David Pursehouse2018-06-201-0/+3
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.6: Temporarily @Ignore flaky CommitCommandTest methods Change-Id: Idc653c22a9af2013a4c481bb19ca8d059f5c34d0 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | * \ \ Merge branch 'stable-4.5' into stable-4.6David Pursehouse2018-06-191-0/+3
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.5: Temporarily @Ignore flaky CommitCommandTest methods Change-Id: I2a0e0b63a06f442f5a088d4bc8bb08eaf02ce952 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | * | | Temporarily @Ignore flaky CommitCommandTest methodsDave Borowitz2018-06-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2c42d014323bd29b85bf76f1a20c83f612406d7 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> (cherry picked from commit e93b0026ced10c956e76daed038f2560a33b5baf)
* | | | | | | | | Avoid expensive getAllRefsByPeeledObjectId() in PlotWalk constructorThomas Wolf2018-06-151-7/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, do it when we return the first PlotCommit from next(). On a repository with many refs, getAllRefsByPeeledObjectId() can take a while. Doing a late initialization simplifies the handling of a PlotWalk. EGit, for instance, creates and configures an instance, and then does the real walk in a background job. With late initialization, the potentially expensive getAllRefsByPeeledObjectId() also occurs in that background job. Bug: 485743 Change-Id: I84c020cf8f7afda6f181778786612b8e6ddd7ed8 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
* | | | | | | | | Update Maven pluginsMatthias Sohn2018-06-142-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - build-helper-maven-plugin 3.0.0 - eclipse-jarsigner-plugin 1.1.5 - jacoco-maven-plugin 0.8.1 - maven-clean-plugin 3.1.0 - maven-jar-plugin 3.1.2 - maven-pmd-plugin 3.10.0 - maven-resources-plugin 3.1.0 - maven-shade-plugin 3.1.1 - maven-site-plugin 3.7.1 - maven-surefire-plugin 2.21.0 - maven-surefire-report-plugin 2.21.0 - plexus-compiler-javac 2.8.4 - spotbugs-maven-plugin 3.1.3.1 - tycho 1.2.0 (leftover) - wagon-ssh 3.1.0 Change-Id: I8eba2ee448437a775542ef6a7c59661727aa207c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | | Upgrade Tycho to 1.2.0Michael Keppler2018-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f1c81839d2d78ddfd10b3992d1145546d10fa8c Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | | Merge branch 'stable-5.0'Matthias Sohn2018-06-1410-91/+325
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Prepare 5.0.1-SNAPSHOT builds JGit v5.0.0.201806131550-r JGit v5.0.0.201806131210-r Downgrade Apache httpclient to 4.5.2.v20170210-0925 RefUpdateTest: Refactor to not use deprecated Repository#getAllRefs Propagate failure of ssh command to caller of SshSupport Make JGit describe behaves same as c-git for lightweight tags Fix issues with LFS on GitHub (SSH) Change-Id: I0471440919adfdbfc72996711d9e0bbd1f3cf477 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | Prepare 5.0.1-SNAPSHOT buildsMatthias Sohn2018-06-1356-357/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iadf12dbdd63ef17c3f712c0fc18495304aa35016 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | JGit v5.0.0.201806131550-rv5.0.0.201806131550-rMatthias Sohn2018-06-1356-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2d548676217250593c3f0c383aec19e12e5e4a4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | JGit v5.0.0.201806131210-rMatthias Sohn2018-06-1356-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iedccfcaf57c11822f1faf5d5195357de42b2a14e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | Downgrade Apache httpclient to 4.5.2.v20170210-0925Matthias Sohn2018-06-132-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eclipse platform uses this version from the Oxygen Orbit release for Photon. In order to avoid that we end up with two slightly different versions in the same p2 repository of the simultaneous release we downgrade temporarily from the version 4.5.2.v20180410-1551 in the Photon Orbit release. See https://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg15659.html Change-Id: Id46a840aa4b1010af7fe311498f17f1f2e5b81e0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | RefUpdateTest: Refactor to not use deprecated Repository#getAllRefsDavid Pursehouse2018-06-131-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I157e62a0e1479d4bc95ef867e616ca8a30041759 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | | | | Propagate failure of ssh command to caller of SshSupportMatthias Sohn2018-06-137-28/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When SshSupport.runSshCommand fails since the executed external ssh command failed throw a CommandFailedException. If discovery of LFS server fails due to failure of the git-lfs-authenticate command chain the CommandFailureException to the LfsConfigInvalidException in order to allow root cause analysis in the application using that. Change-Id: I2f9ea2be11274549f6d845937164c248b3d840b2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | Make JGit describe behaves same as c-git for lightweight tagsMarcel Trautwein2018-06-132-38/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JGit now considers lightweight tags only if the --tags option is set i.e. `git.describe().setAllTags(true)` has to be set, else the default is now as in c git: Only annotated tags are evaluated unless you pass true equivalent to --tags (or --all) by the option setAllTags. Hint: This (still) doesn't address any difference between c-git `--all` and `!--all --tags` behavior; perhaps this might be a follow up request Bug: 423206 Change-Id: I9a3699756df0b9c6a7c74a7e8887dea0df17c8e7 Signed-off-by: Marcel Trautwein <me+eclipse@childno.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | Fix issues with LFS on GitHub (SSH)Markus Duft2018-06-125-16/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * URIish seems to have a tiny feature (bug?). The path of the URI starts with a '/' only if the URI has a port set (it seems). * GitHub does not return SSH authorization on a single line as Gerrit does - need to account for that. * Increase the SSH git-lfs-authenticate timeout, as GitHub sometimes responds slower than expected. * Guard against NPE in case the download action does not contain any additional headers. Change-Id: Icd1ead3d015479fd4b8bbd42ed42129b0abfb95c Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com>
* | | | | | | | | Merge branch 'stable-5.0'David Pursehouse2018-06-120-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Empty merge. The stable-4.9 branch was merged directly into stable-5.0 by [1], and then there were separate merges up through stable-4.10 to stable-4.11 by [2] and [3]. When stable-4.11 was merged in to stable-5.0 in [4] it was an empty merge, since the change had already been brought in by [1]. [1] https://git.eclipse.org/r/#/c/124301/-1..2 [2] https://git.eclipse.org/r/#/c/124320/-1..1 [3] https://git.eclipse.org/r/#/c/124321/-1..1 [4] https://git.eclipse.org/r/#/c/124332/-1..1 Change-Id: I91304b1bdad41837814d221971750b2b64bdcf6a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | | | | Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2018-06-110-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Change-Id: Iec2dafd00979ab02f5ab698fc514866255007de5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2018-06-110-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Ensure DirectoryStream is closed promptly Change-Id: I2c0d5ea96b2c96336908674032d0f7d39dc062b9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | | | | Merge branch 'stable-4.9' into stable-4.10Matthias Sohn2018-06-111-13/+13
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Ensure DirectoryStream is closed promptly Change-Id: I62674a1db9266c04fb353ab697e2c0a24a7369b7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | Merge "Merge branch 'stable-4.10' into stable-4.11" into stable-4.11Matthias Sohn2018-05-103-30/+56
| | |\ \ \ \ \ \ \
* | | | | | | | | | Merge branch 'stable-5.0'David Pursehouse2018-06-111-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Fix Javadoc typo Change-Id: Ib864f5871f8e99d2a776b7ae9f782ec3eb312d50 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | | | | | Fix Javadoc typoMichael Keppler2018-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib4ebc57236bdea663f27295764886413e2550580 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | | | | Merge branch 'stable-5.0'Matthias Sohn2018-06-105-10/+65
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: Ensure Jsch checks all configured algorithms RawTextTest#testBinary: use array comparison to compare arrays LFS: Better SSH authentication token timeout handling Ensure DirectoryStream is closed promptly Validate branch names on branch creation Change-Id: Ic4f6a24b6ccee6730eee3fd5dcb0d1f3e291c478 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | | | | | Ensure Jsch checks all configured algorithmsThomas Wolf2018-06-101-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jsch checks only for the availability of the algorithms given by Jsch-internal config keys "CheckCiphers", "CheckKexes", and "CheckSignatures". If the ssh config defines any algorithms unknown to Jsch not listed in those keys, it'll still propose them during the negotiation phase, and run into an NPE later on if the server happens to propose such an algorithm and it gets chosen. Jsch reads those "CheckCiphers" and the other values from either a session-local config, or the global static Jsch config. It bypasses ~/.ssh/config for these values. Therefore, copy these values from the config as read from ~/.ssh/config into the session-specific config. That makes Jsch check _all_ configured algorithms up front, discarding any for which it has no implementation. Thus it proposes only algorithms it actually can handle. Bug: 535672 Change-Id: I6a68e54f4d9a3267e895c536bcf3c58099826ad5 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
| * | | | | | | | | Merge branch 'stable-4.9' into stable-5.0Matthias Sohn2018-06-100-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Ensure DirectoryStream is closed promptly Change-Id: I447a01e1170db85fcf5978206ed35ad1956a2d82 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | | | | | Ensure DirectoryStream is closed promptlyDave Borowitz2018-06-091-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the javadoc for Files.list: "The returned stream encapsulates a DirectoryStream. If timely disposal of file system resources is required, the try-with-resources construct should be used to ensure that the stream's close method is invoked after the stream operations are completed." This is the only call to Files#newDirectoryStream that is not already in a try-with-resources. Change-Id: I91e6c56b5d74e8435457ad6ed9e6b4b24d2aa14e (cherry picked from commit 1c16ea4601920c9dbc7a0202efc20137e1a63d55)
| * | | | | | | | | RawTextTest#testBinary: use array comparison to compare arraysMatthias Sohn2018-06-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac1feadf24858a0bdf0cb224f16b34e9498fe3bb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 10:20:04 +0000