David Pursehouse
28f0ef8509
Merge branch 'stable-4.11' into stable-5.0
...
* stable-4.11:
Fix DescribeCommand with multiple match options
Fix git-describe tie-breakers
Change-Id: Ibb98f143ee0ce7635beb30ec404b4134a73788f6
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
6 years ago
Matthias Sohn
df6263644b
Fix DescribeCommand with multiple match options
...
when multiple match options are given in git describe the result must
not depend on the order of the match options. JGit wrongly picked the
first match using the match options in the order they were defined. Fix
this by concatenating the streams of matching tags for all match options
and then choosing the first match on the concatenated stream sorted in
tie break order.
See https://git-scm.com/docs/git-describe#git-describe---matchltpatterngt
Change-Id: Id01433d35fa16fb4c30526605bee041ac1d954b2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Håvard Wall
f9de917547
Fix git-describe tie-breakers
...
Correct behaviour as git 1.7.1.1 is to resolve tie-breakers to choose
the most recent tag.
https://github.com/git/git/blob/master/Documentation/RelNotes/1.7.1.1.txt :
* "git describe" did not tie-break tags that point at the same commit
correctly; newer ones are preferred by paying attention to the
tagger date now.
Bug: 538610
Change-Id: Ib0b2a301997bb7f75935baf7005473f4de952a64
Signed-off-by: Håvard Wall <haavardw@gmail.com>
6 years ago
David Pursehouse
f40a5a12e4
Merge branch 'stable-4.11' into stable-5.0
...
* 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>
6 years ago
Matthias Sohn
9b6d30f2c1
Prepare 4.11.6-SNAPSHOT builds
...
Change-Id: Ic823775aad59530f516602e7e848474d65763314
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
92aca6195d
JGit v4.11.5.201810191925-r
...
Change-Id: I9d11536062de74775ca545c26f341610d0ddaeb2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
976a8e369d
Merge branch 'stable-4.10' into stable-4.11
...
* 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>
6 years ago
Matthias Sohn
019f1b2d4c
Merge branch 'stable-4.9' into stable-4.10
...
* 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>
6 years ago
Matthias Sohn
7ae004509c
Prepare 4.9.8-SNAPSHOT builds
...
Change-Id: Iab7b0f2a21a76f801a83fbeb54f09d1525878f4d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
97534056fc
JGit v4.9.7.201810191756-r
...
Change-Id: Ib980731eb9ec7f4c92deac9b4cf2f7a994d670c2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
97b62cf9dd
Update API problem filter
...
Change-Id: Iba8650900d3936edccbe30de9d3eafd4f9e0dba6
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
cee3ef1a0e
Merge branch 'stable-4.8' into stable-4.9
...
* 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>
6 years ago
Matthias Sohn
566a5dcc21
Merge branch 'stable-4.7' into stable-4.8
...
* 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
6 years ago
Matthias Sohn
d6c587faef
Prepare 4.7.7-SNAPSHOT builds
...
Change-Id: I131e40cbbf32bc75d2ed24ca31ba3613a3bbca25
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
b811e4fc51
JGit v4.7.6.201810191618-r
...
Change-Id: Iaee27d5e2de016240f1a0940653fef82c6044a1d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
2674bec32b
Update API problem filter
...
Change-Id: I66c0c490bb66adafac5d670d2d9571f1674a281e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
David Pursehouse
ffaada75e4
Merge branch 'stable-4.6' into stable-4.7
...
* 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>
6 years ago
David Pursehouse
926a126f72
Merge branch 'stable-4.5' into stable-4.6
...
* 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>
6 years ago
David Pursehouse
c31108bcc5
Merge branch 'stable-4.4' into stable-4.5
...
* 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>
6 years ago
David Pursehouse
0de9ca38f4
Merge branch 'stable-4.3' into stable-4.4
...
* stable-4.3:
JGit v4.0.3.201509231615-r
Change-Id: I147d81a9cc9c0f9e66084897df9c88c369539db7
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
6 years ago
David Pursehouse
2a21b330d6
Merge branch 'stable-4.2' into stable-4.3
...
* stable-4.2:
JGit v4.0.3.201509231615-r
Change-Id: Ic90ef74497afee9da4b49dcb53302b4efa5b9f26
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
6 years ago
David Pursehouse
27acb4ab25
Merge branch 'stable-4.1' into stable-4.2
...
* stable-4.1:
JGit v4.0.3.201509231615-r
Change-Id: I6cc5bcefad2e8dee3394770d36608f981bfc9a9e
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
6 years ago
David Pursehouse
aebc8a41b8
Merge branch 'stable-4.0' into stable-4.1
...
* stable-4.0:
JGit v4.0.3.201509231615-r
Change-Id: Ie74b0392ef145ffd27dc903c45f7fec2d4492a17
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
6 years ago
Matthias Sohn
89388d67f8
Fix file handle leak in ObjectDownloadListener.onWritePossible
...
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>
6 years ago
David Pursehouse
33744a2dfe
Merge branch 'stable-4.6' into stable-4.7
...
* 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>
6 years ago
David Pursehouse
27f7a590d1
Merge branch 'stable-4.5' into stable-4.6
...
* 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>
6 years ago
David Pursehouse
2db49bc679
Replace Findbugs with Spotbugs in org.eclipse.jgit/pom.xml
...
Change-Id: If9cb0de7a0e7bd95eac7daeee140a18385192a48
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
6 years ago
David Pursehouse
7eb34c175c
Replace FindBugs with SpotBugs
...
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>
6 years ago
Jonathan Nieder
e63ca8d094
Merge branch 'stable-4.11' into stable-5.0
...
* 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>
6 years ago
Jonathan Nieder
eb41de5b25
Merge branch 'stable-4.10' into stable-4.11
...
* 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>
6 years ago
Jonathan Nieder
8b239e5b75
Merge branch 'stable-4.9' into stable-4.10
...
* 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>
6 years ago
Jonathan Nieder
9d91bf189e
Merge branch 'stable-4.8' into stable-4.9
...
* stable-4.8:
SubmoduleValidator: Remove unused import of ConfigConstants
Change-Id: Id01fd9945e23a9343f96c42db89d5a1b302dad33
Signed-off-by: Jonathan Nieder <jrn@google.com>
6 years ago
Jonathan Nieder
f282aaa137
Merge branch 'stable-4.7' into stable-4.8
...
* stable-4.7:
SubmoduleValidator: Remove unused import of ConfigConstants
Change-Id: I6a7d19602d6d9099928ee52de727743b9717f262
Signed-off-by: Jonathan Nieder <jrn@google.com>
6 years ago
David Pursehouse
26e7a74601
SubmoduleValidator: Remove unused import of ConfigConstants
...
Change-Id: I6afe5690bf9d1f1f4d414aa618daefc8b48d217e
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
6 years ago
Jonathan Nieder
8ef8b71db9
Merge branch 'stable-4.8' into stable-4.9
...
* stable-4.8:
SubmoduleValidator: Permit missing path or url
Change-Id: I989ac2c0c124c82385fc7cac7e0544ec225f7589
Signed-off-by: Jonathan Nieder <jrn@google.com>
6 years ago
Jonathan Nieder
830e0d6b8c
Merge branch 'stable-4.7' into stable-4.8
...
* stable-4.7:
SubmoduleValidator: Permit missing path or url
Change-Id: I94fdaf45abbf7665f9eddc14b1a7f7144aafeadf
Signed-off-by: Jonathan Nieder <jrn@google.com>
6 years ago
Jonathan Nieder
d3eaf1007b
SubmoduleValidator: Permit missing path or url
...
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>
6 years ago
Jonathan Nieder
3e73672c06
Merge branch 'stable-4.11' into stable-5.0
...
* stable-4.11:
ObjectChecker#getGitsubmodules: Fix malformed javadoc
Change-Id: If82e40c5a39b84c6a63e8cc10d168696c4eb3e91
Signed-off-by: Jonathan Nieder <jrn@google.com>
6 years ago
Jonathan Nieder
735f79c663
Merge branch 'stable-4.10' into stable-4.11
...
* stable-4.10:
ObjectChecker#getGitsubmodules: Fix malformed javadoc
Change-Id: Id2c8d1d4ffdf7bf18ef64479cfa1e959d9b2c37e
Signed-off-by: Jonathan Nieder <jrn@google.com>
6 years ago
Jonathan Nieder
112a19711d
Merge branch 'stable-4.9' into stable-4.10
...
* stable-4.9:
ObjectChecker#getGitsubmodules: Fix malformed javadoc
Change-Id: I847bdb9ef2b9e733c79489577b8b6e852ce6abf3
Signed-off-by: Jonathan Nieder <jrn@google.com>
6 years ago
Jonathan Nieder
acd35d5384
Merge branch 'stable-4.8' into stable-4.9
...
* stable-4.8:
ObjectChecker#getGitsubmodules: Fix malformed javadoc
Change-Id: Ic73df5571e1ae86e5e026d0bf9d8e9e330cbfa97
Signed-off-by: Jonathan Nieder <jrn@google.com>
6 years ago
David Pursehouse
f6eb785551
Merge branch 'stable-4.7' into stable-4.8
...
* stable-4.7:
ObjectChecker#getGitsubmodules: Fix malformed javadoc
Change-Id: I51ddd8fa1c2fbcabfb010bc4662d2c925563b55a
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
6 years ago
David Pursehouse
df8bd762a1
ObjectChecker#getGitsubmodules: Fix malformed javadoc
...
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>
6 years ago
Matthias Sohn
23ebbe5662
Merge branch 'stable-4.11' into stable-5.0
...
* stable-4.11:
Prepare 4.11.5-SNAPSHOT builds
JGit v4.11.4.201810060650-r
Fix configuration of maven-javadoc-plugin
Prepare 4.9.7-SNAPSHOT builds
JGit v4.9.6.201810051924-r
Prepare 4.7.6-SNAPSHOT builds
JGit v4.7.5.201810051826-r
BaseReceivePack: Validate incoming .gitmodules files
ObjectChecker: Report .gitmodules files found in the pack
SubmoduleAddCommand: Reject submodule URIs that look like cli options
* Fix configuration of maven-javadoc-plugin for site generation
Change-Id: Ic6ff8d324867ee41f15a5b890c7eee5092e8453e
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
620370ab6a
Prepare 4.11.5-SNAPSHOT builds
...
Change-Id: Ifbe76e14264e8b547930e2320e8e81d728bd6e38
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
c2a866b109
JGit v4.11.4.201810060650-r
...
Change-Id: I5700ebd341b6b997a7757b17e7d731c4ce608ec2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
816bcd259e
Merge branch 'stable-4.10' into stable-4.11
...
* stable-4.10:
Fix configuration of maven-javadoc-plugin
Change-Id: I80db074c45e840f15e227a400ef637b85084e711
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
f07e48cc10
Fix configuration of maven-javadoc-plugin
...
Since maven-javadoc-plugin additionalJOption replaces additionalparam to
pass additional options to JavaDoc.
See https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html#additionalJOption
Change-Id: Iddff5873520a181bcb9edf285b0c8db532e930ee
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
f016e32471
Merge branch 'stable-4.10' into stable-4.11
...
* stable-4.10:
Prepare 4.9.7-SNAPSHOT builds
JGit v4.9.6.201810051924-r
Prepare 4.7.6-SNAPSHOT builds
JGit v4.7.5.201810051826-r
BaseReceivePack: Validate incoming .gitmodules files
ObjectChecker: Report .gitmodules files found in the pack
SubmoduleAddCommand: Reject submodule URIs that look like cli options
Change-Id: Ibd759f5d425f714e79b3137ff8e5b0f989933de0
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago
Matthias Sohn
c0a973657f
Merge branch 'stable-4.9' into stable-4.10
...
* stable-4.9:
Prepare 4.9.7-SNAPSHOT builds
JGit v4.9.6.201810051924-r
Prepare 4.7.6-SNAPSHOT builds
JGit v4.7.5.201810051826-r
BaseReceivePack: Validate incoming .gitmodules files
ObjectChecker: Report .gitmodules files found in the pack
SubmoduleAddCommand: Reject submodule URIs that look like cli options
Change-Id: Ie59e34eb591a827d1ce8e483eec6d390a3c81702
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
6 years ago