summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* JGit v5.1.3.201810200350-rv5.1.3.201810200350-rMatthias Sohn2018-10-2056-59/+59
| | | | | Change-Id: Ib2c5a79d4fdf77680b7b65652fc3659527df27ad Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-5.0' into stable-5.1David Pursehouse2018-10-200-0/+0
|\ | | | | | | | | | | | | | | | | | | * stable-5.0: All commits from stable-5.0 are already in stable-5.1 due to an accidental merge of stable-4.11 into stable-5.1 by I3ec3c9af4. Change-Id: I8a89d103be2b2cb7657e82a124e7db41239a2447 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * Merge branch 'stable-4.11' into stable-5.0David Pursehouse2018-10-201-1/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Prepare 4.11.6-SNAPSHOT builds JGit v4.11.5.201810191925-r Prepare 4.9.8-SNAPSHOT builds JGit v4.9.7.201810191756-r Update API problem filter Prepare 4.7.7-SNAPSHOT builds JGit v4.7.6.201810191618-r Update API problem filter Fix file handle leak in ObjectDownloadListener.onWritePossible Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xml Replace FindBugs with SpotBugs Prepare 4.4.2-SNAPSHOT builds JGit v4.0.3.201509231615-r Change-Id: Ib6493d2b6270fe4f237ea52d97848239c16c1d9d Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | \ Merge "Merge branch 'stable-4.11' into stable-5.0" into stable-5.1David Pursehouse2018-10-201-1/+6
|\ \ \
| * \ \ Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2018-10-201-1/+6
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Prepare 4.11.6-SNAPSHOT builds JGit v4.11.5.201810191925-r Prepare 4.9.8-SNAPSHOT builds JGit v4.9.7.201810191756-r Update API problem filter Prepare 4.7.7-SNAPSHOT builds JGit v4.7.6.201810191618-r Update API problem filter Fix file handle leak in ObjectDownloadListener.onWritePossible Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xml Replace FindBugs with SpotBugs Prepare 4.4.2-SNAPSHOT builds JGit v4.0.3.201509231615-r Change-Id: I3ec3c9af49b11979a551a9749d5a8ba5ef2ef726 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * Prepare 4.11.6-SNAPSHOT buildsMatthias Sohn2018-10-2056-356/+356
| | | | | | | | | | | | | | | Change-Id: Ic823775aad59530f516602e7e848474d65763314 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * JGit v4.11.5.201810191925-rv4.11.5.201810191925-rMatthias Sohn2018-10-2056-59/+59
| | | | | | | | | | | | | | | Change-Id: I9d11536062de74775ca545c26f341610d0ddaeb2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2018-10-201-1/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Prepare 4.9.8-SNAPSHOT builds JGit v4.9.7.201810191756-r Update API problem filter Prepare 4.7.7-SNAPSHOT builds JGit v4.7.6.201810191618-r Update API problem filter Fix file handle leak in ObjectDownloadListener.onWritePossible Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xml Replace FindBugs with SpotBugs Prepare 4.4.2-SNAPSHOT builds JGit v4.0.3.201509231615-r Change-Id: I5698fde41417c4ce9e813c683c84978f303b76fe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * Merge branch 'stable-4.9' into stable-4.10Matthias Sohn2018-10-201-1/+6
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Prepare 4.9.8-SNAPSHOT builds JGit v4.9.7.201810191756-r Update API problem filter Prepare 4.7.7-SNAPSHOT builds JGit v4.7.6.201810191618-r Update API problem filter Fix file handle leak in ObjectDownloadListener.onWritePossible Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xml Replace FindBugs with SpotBugs Prepare 4.4.2-SNAPSHOT builds JGit v4.0.3.201509231615-r Change-Id: I6f07ea02491ba3a32f30ee2408e1153241cc8a07 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * Prepare 4.9.8-SNAPSHOT buildsMatthias Sohn2018-10-2056-333/+333
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iab7b0f2a21a76f801a83fbeb54f09d1525878f4d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * JGit v4.9.7.201810191756-rv4.9.7.201810191756-rMatthias Sohn2018-10-1956-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib980731eb9ec7f4c92deac9b4cf2f7a994d670c2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * Update API problem filterMatthias Sohn2018-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iba8650900d3936edccbe30de9d3eafd4f9e0dba6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * Merge branch 'stable-4.8' into stable-4.9Matthias Sohn2018-10-191-1/+6
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Prepare 4.7.7-SNAPSHOT builds JGit v4.7.6.201810191618-r Update API problem filter Fix file handle leak in ObjectDownloadListener.onWritePossible Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xml Replace FindBugs with SpotBugs Prepare 4.4.2-SNAPSHOT builds JGit v4.0.3.201509231615-r Change-Id: Ic18af2ddcba8f7a53eb27a33ea9f637adb941993 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * Merge branch 'stable-4.7' into stable-4.8Matthias Sohn2018-10-191-1/+6
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Prepare 4.7.7-SNAPSHOT builds JGit v4.7.6.201810191618-r Update API problem filter Fix file handle leak in ObjectDownloadListener.onWritePossible Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xml Replace FindBugs with SpotBugs Prepare 4.4.2-SNAPSHOT builds JGit v4.0.3.201509231615-r Change-Id: I783a083c0092a400f28f7977fbc4e556af88c8de
| | | | | | * Prepare 4.7.7-SNAPSHOT buildsMatthias Sohn2018-10-1956-321/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I131e40cbbf32bc75d2ed24ca31ba3613a3bbca25 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * JGit v4.7.6.201810191618-rv4.7.6.201810191618-rMatthias Sohn2018-10-1956-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaee27d5e2de016240f1a0940653fef82c6044a1d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * Update API problem filterMatthias Sohn2018-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I66c0c490bb66adafac5d670d2d9571f1674a281e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * Merge branch 'stable-4.6' into stable-4.7David Pursehouse2018-10-190-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.6: Prepare 4.4.2-SNAPSHOT builds JGit v4.0.3.201509231615-r Change-Id: I3e1a870a225447e761368298ce9b65dbec2c2a82 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | * Merge branch 'stable-4.5' into stable-4.6David Pursehouse2018-10-190-0/+0
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.5: Prepare 4.4.2-SNAPSHOT builds JGit v4.0.3.201509231615-r Change-Id: I9c925a65d42559443ade9ac8291ffe00f4a1dda1 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | | * Merge branch 'stable-4.4' into stable-4.5David Pursehouse2018-10-190-0/+0
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.4: Prepare 4.4.2-SNAPSHOT builds JGit v4.0.3.201509231615-r Change-Id: Icd66a796b0cce93c75a52cc77fec8f9df3eeccb4 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | | | * Merge branch 'stable-4.3' into stable-4.4stable-4.4David Pursehouse2018-10-190-0/+0
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.3: JGit v4.0.3.201509231615-r Change-Id: I147d81a9cc9c0f9e66084897df9c88c369539db7 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | | | | * Merge branch 'stable-4.2' into stable-4.3stable-4.3David Pursehouse2018-10-190-0/+0
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.2: JGit v4.0.3.201509231615-r Change-Id: Ic90ef74497afee9da4b49dcb53302b4efa5b9f26 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | | | | | * Merge branch 'stable-4.1' into stable-4.2stable-4.2David Pursehouse2018-10-190-0/+0
| | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.1: JGit v4.0.3.201509231615-r Change-Id: I6cc5bcefad2e8dee3394770d36608f981bfc9a9e Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | | | | | | * Merge branch 'stable-4.0' into stable-4.1stable-4.1David Pursehouse2018-10-190-0/+0
| | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.0: JGit v4.0.3.201509231615-r Change-Id: Ie74b0392ef145ffd27dc903c45f7fec2d4492a17 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | | | | | | | * JGit v4.0.3.201509231615-rv4.0.3.201509231615-rstable-4.0Matthias Sohn2015-09-2346-49/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ec09e82d806cde61165a6ceb79de022f18d9fe2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | | | | * | | | | Prepare 4.4.2-SNAPSHOT buildsMatthias Sohn2016-07-1556-302/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d75fb5bddb1a6dd23604ba57c9798c978afca89 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * | | | | | | | Fix file handle leak in ObjectDownloadListener.onWritePossibleMatthias Sohn2018-10-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c134f4d removed closing the input stream when we reached end of the stream. This caused file handle leaks. Bug: 540049 Change-Id: I48082b537077c7471fc160f59aa04deb99687d9b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | | * | | | | | | | Merge branch 'stable-4.6' into stable-4.7David Pursehouse2018-10-132-11/+11
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.6: Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xml Replace FindBugs with SpotBugs Change-Id: I24417e4ebbba31f7ff6896d585ef807327411392 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | * | | | | | | Merge branch 'stable-4.5' into stable-4.6David Pursehouse2018-10-132-10/+11
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.5: Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xml Replace FindBugs with SpotBugs Change-Id: I1c077e8f3530ac717b1603d3307fd15d4335b8fe Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | | * | | | | | Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xmlDavid Pursehouse2018-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If9cb0de7a0e7bd95eac7daeee140a18385192a48 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | | | * | | | | | Replace FindBugs with SpotBugsDavid Pursehouse2018-10-091-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SpotBugs [1] is the spiritual successor of FindBugs, carrying on from the point where it left off with support of its community. This is a backport of [1] which originally did the replacement on the master branch. This change updates to the current latest version, so that we can get the benefit of its checks when pushing changes to the stable branches. [1] https://spotbugs.github.io/ [2] https://git.eclipse.org/r/#/c/101312/ Change-Id: Ib73d56b5980b55f4d7e09d87abec3138cac3d3dc Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | | | | | | | | | ssh: Prefer algorithms of the known host keysSaša Živkov2018-10-181-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JSch prefers ssh-rsa key type. When the remote server supports ssh-rsa key type then this key type will be used even if the known_hosts file contains a host key for that host, but with different key type. This caused an unexpected UnknownHostKey error. To fix the issue first scan the known_hosts, the HostKeyRepository in JSch API, for any already existing host keys for the target host and modify the default session settings to prefer their algorithms. However, do this only if there is no HostKeyAlgorithms setting active. Change-Id: I236df2a860ddd9289a0a820ddf09c2dea3673d36
* | | | | | | | | | | | | | Merge branch 'stable-5.0' into stable-5.1Jonathan Nieder2018-10-081-12/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: SubmoduleValidator: Remove unused import of ConfigConstants SubmoduleValidator: Permit missing path or url Change-Id: Iaa3160a1307777cc4233d82e50a57c63d75d141c Signed-off-by: Jonathan Nieder <jrn@google.com>
| * | | | | | | | | | | | | Merge branch 'stable-4.11' into stable-5.0Jonathan Nieder2018-10-081-12/+16
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: SubmoduleValidator: Remove unused import of ConfigConstants SubmoduleValidator: Permit missing path or url Change-Id: Iaf3b994e763bd02054b820cd87fe68ff83675001 Signed-off-by: Jonathan Nieder <jrn@google.com>
| | * | | | | | | | | | | | Merge branch 'stable-4.10' into stable-4.11Jonathan Nieder2018-10-081-12/+16
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: SubmoduleValidator: Remove unused import of ConfigConstants SubmoduleValidator: Permit missing path or url Change-Id: Id74c837d6cb728439ccbd6ade71936b493c09e08 Signed-off-by: Jonathan Nieder <jrn@google.com>
| | | * | | | | | | | | | | Merge branch 'stable-4.9' into stable-4.10Jonathan Nieder2018-10-081-12/+16
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: SubmoduleValidator: Remove unused import of ConfigConstants SubmoduleValidator: Permit missing path or url Change-Id: Ib3c311f1e8d2db95510292a72f2f49825ffce9d9 Signed-off-by: Jonathan Nieder <jrn@google.com>
| | | | * | | | | | | | | | Merge branch 'stable-4.8' into stable-4.9Jonathan Nieder2018-10-081-1/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: SubmoduleValidator: Remove unused import of ConfigConstants Change-Id: Id01fd9945e23a9343f96c42db89d5a1b302dad33 Signed-off-by: Jonathan Nieder <jrn@google.com>
| | | | | * | | | | | | | | Merge branch 'stable-4.7' into stable-4.8Jonathan Nieder2018-10-081-1/+0
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: SubmoduleValidator: Remove unused import of ConfigConstants Change-Id: I6a7d19602d6d9099928ee52de727743b9717f262 Signed-off-by: Jonathan Nieder <jrn@google.com>
| | | | | | * | | | | | | | SubmoduleValidator: Remove unused import of ConfigConstantsDavid Pursehouse2018-10-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6afe5690bf9d1f1f4d414aa618daefc8b48d217e Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | * | | | | | | | | | Merge branch 'stable-4.8' into stable-4.9Jonathan Nieder2018-10-081-11/+16
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: SubmoduleValidator: Permit missing path or url Change-Id: I989ac2c0c124c82385fc7cac7e0544ec225f7589 Signed-off-by: Jonathan Nieder <jrn@google.com>
| | | | | * | | | | | | | | Merge branch 'stable-4.7' into stable-4.8Jonathan Nieder2018-10-081-11/+16
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: SubmoduleValidator: Permit missing path or url Change-Id: I94fdaf45abbf7665f9eddc14b1a7f7144aafeadf Signed-off-by: Jonathan Nieder <jrn@google.com>
| | | | | | * | | | | | | | SubmoduleValidator: Permit missing path or urlJonathan Nieder2018-10-081-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A .gitmodules file can include a submodule without a path to configure the URL for a submodule that is only present on other branches. A .gitmodules file can include a submodule with no URL and no path to reserve the name for a submodule that existed in earlier history but is not available from any URL any more. "git fsck" permits both of these cases. Permit them in JGit as well (instead of throwing NullPointerException). Change-Id: I3b442639ad79ea7a59227f96406a12e62d3573ae Reported-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Jonathan Nieder <jrn@google.com>
* | | | | | | | | | | | | | Update API warning filter to 5.1.3Matthias Sohn2018-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We added API in 4.7.5 to fix CVE-2018-17456 Change-Id: I14698fb088de91b8ba8856e461f64138025a89fa Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | | | | | | | | | Merge branch 'stable-5.0' into stable-5.1Jonathan Nieder2018-10-071-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-5.0: ObjectChecker#getGitsubmodules: Fix malformed javadoc Change-Id: Ib32077c6640621670649fa4fbfcc8d0c9d8346f1 Signed-off-by: Jonathan Nieder <jrn@google.com>
| * | | | | | | | | | | | | Merge branch 'stable-4.11' into stable-5.0Jonathan Nieder2018-10-071-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: ObjectChecker#getGitsubmodules: Fix malformed javadoc Change-Id: If82e40c5a39b84c6a63e8cc10d168696c4eb3e91 Signed-off-by: Jonathan Nieder <jrn@google.com>
| | * | | | | | | | | | | | Merge branch 'stable-4.10' into stable-4.11Jonathan Nieder2018-10-071-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: ObjectChecker#getGitsubmodules: Fix malformed javadoc Change-Id: Id2c8d1d4ffdf7bf18ef64479cfa1e959d9b2c37e Signed-off-by: Jonathan Nieder <jrn@google.com>
| | | * | | | | | | | | | | Merge branch 'stable-4.9' into stable-4.10Jonathan Nieder2018-10-071-2/+2
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: ObjectChecker#getGitsubmodules: Fix malformed javadoc Change-Id: I847bdb9ef2b9e733c79489577b8b6e852ce6abf3 Signed-off-by: Jonathan Nieder <jrn@google.com>
| | | | * | | | | | | | | | Merge branch 'stable-4.8' into stable-4.9Jonathan Nieder2018-10-071-2/+2
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: ObjectChecker#getGitsubmodules: Fix malformed javadoc Change-Id: Ic73df5571e1ae86e5e026d0bf9d8e9e330cbfa97 Signed-off-by: Jonathan Nieder <jrn@google.com>
| | | | | * | | | | | | | | Merge branch 'stable-4.7' into stable-4.8David Pursehouse2018-10-071-2/+2
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: ObjectChecker#getGitsubmodules: Fix malformed javadoc Change-Id: I51ddd8fa1c2fbcabfb010bc4662d2c925563b55a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | | * | | | | | | | ObjectChecker#getGitsubmodules: Fix malformed javadocDavid Pursehouse2018-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text "<tree, blob>" with angle brackets should not be used in javadoc since it is interpreted as an HTML tag and then rejected since it's not a valid HTML tag. Wrap the text in a @literal tag. Also add a missing space. Change-Id: Ide045e8c04a39a916f5b2e964e58c151e4555830 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-17 08:49:17 +0000