summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* WorkingTreeIterator should pass FS to submodulesMarc Strapetz2017-12-302-3/+22
| | | | | Change-Id: I4b7bc6bab449b9e3aebba8170788ff9e4a04195a Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
* CloneCommand: option to set FS to be usedMarc Strapetz2017-12-291-0/+20
| | | | | Change-Id: If8342974d07b7d89a6c5721a6dd03826886aa89e Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
* InitCommand: option to set FS to be usedMarc Strapetz2017-12-291-0/+20
| | | | | Change-Id: I95c72f3bdc2da748adbb0d82af72f60650821aab Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
* Add a command to deinitialize submodulesDavid Turner2017-12-276-1/+691
| | | | | Change-Id: Iaaefc2cbafbf083d6ab158b1c378ec69cc76d282 Signed-off-by: David Turner <dturner@twosigma.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Use submodule name instead of path as key in configDavid Turner2017-12-274-12/+20
| | | | | | | | | When a submodule is moved, the "name" field remains the same, while the "path" field changes. Git uses the "name" field in .git/config when a submodule is initialized, so this patch makes JGit do so too. Change-Id: I48d8e89f706447b860c0162822a8e68170aae42b Signed-off-by: David Turner <dturner@twosigma.com>
* Require maven 3.5.2Matthias Sohn2017-12-272-4/+41
| | | | | | | | | | | | This prepares builds on Java 9 [1]. The maven 2 tag "prerequisites" is not honored by maven 3 hence use maven-enforcer-plugin to enforce the minimum maven version. [1] https://issues.apache.org/jira/browse/MNG-6148 Change-Id: I57f5051a0641b1bd21f9f888f1a17d8f98e879e5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Update japicmp-maven-plugin to 0.11.0Matthias Sohn2017-12-261-1/+1
| | | | | Change-Id: Ia0c5308fc4544a3b3a4fd6a19947cfc9a33af9c1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* URIish: support for empty portsMarc Strapetz2017-12-232-13/+34
| | | | | | | | Properly parse URLs like "ssh://host:/path" Bug: 519187 Change-Id: I0054868e30509e4ba919444be16c2a20f741545a Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>
* Upgrade spotbugs-maven-plugin to 3.1.0David Pursehouse2017-12-231-1/+1
| | | | | Change-Id: I1817afd3f75bd1f030f1b5c6bc683afa51dc5a6b Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Add header Automatic-Module-Name for Java 9Karsten Thoms2017-12-2317-0/+17
| | | | | | Bug: 529075 Change-Id: I4532ce2c80eb91531d46026676502d636ccda706 Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-4.9'Matthias Sohn2017-12-234-1/+72
|\ | | | | | | | | | | | | | | * stable-4.9: Strings#convertGlob: fix escaping of patterns like [\[]. Change-Id: I18d55537002b3153db35f8a6b60f2f5317d17248 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Strings#convertGlob: fix escaping of patterns like [\[].Dmitry Pavlenko2017-12-214-1/+72
| | | | | | | | | | | | | | | | | | | | Originally the patterns were escaped twice leading to wrong matching results. Bug: 528886 Change-Id: I26e201b4b0ef51cac08f940b76f381260fa925ca Signed-off-by: Dmitry Pavlenko <pavlenko@tmatesoft.com> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Merge changes I8a37eaf8,Id8a5b591David Pursehouse2017-12-211-32/+1
|\ \ | | | | | | | | | | | | | | | * changes: Remove maven profile jgit.java8 Reenable failing the build on javadoc errors
| * | Remove maven profile jgit.java8Matthias Sohn2017-12-211-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | This profile isn't needed any longer since we require Java 8 as minimum version. Change-Id: I8a37eaf874473ff4004b9c074a810dddebde54c8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Reenable failing the build on javadoc errorsMatthias Sohn2017-12-211-4/+1
| | | | | | | | | | | | | | | Change-Id: Id8a5b59119f3d40dea1bb46ef060a6abfff2f6bd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge changes I0f1df93b,Ifd40129b,I1b059e1aDave Borowitz2017-12-213-24/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: ConfigTest: Add some additional comment parsing tests Config: Drop backslash in invalid escape sequences in subsections Config: Match C git behavior more closely in escaping values
| * | | ConfigTest: Add some additional comment parsing testsDave Borowitz2017-12-211-0/+5
| | | | | | | | | | | | | | | | Change-Id: I0f1df93bd1ceeb847771ea6484f9de539e8c177b
| * | | Config: Drop backslash in invalid escape sequences in subsectionsDave Borowitz2017-12-212-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are ignored by C git when parsing: $ git config -f - --list <<EOF [foo "x\0y"] bar = baz [foo "x\qy"] bar = baz [foo "x\by"] bar = baz [foo "x\ny"] bar = baz [foo "x\ty"] bar = baz EOF foo.x0y.bar=baz foo.xqy.bar=baz foo.xby.bar=baz foo.xny.bar=baz foo.xty.bar=baz This behavior is different from value parsing, where an invalid escape sequence is an error (which JGit already does as well): $ git config -f - --list <<EOF [foo] bar = x\qy EOF fatal: bad config line 2 in standard input Change-Id: Ifd40129b37d9a62df3d886d8d7e22f766f54e9d1
| * | | Config: Match C git behavior more closely in escaping valuesDave Borowitz2017-12-213-13/+38
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So this happened: $ git config -f foo.config foo.a 'x"y' $ git config -f foo.config foo.b x\\y $ git config -f foo.config foo.c $'x\ny' $ git config -f foo.config foo.d $'x\ty' $ git config -f foo.config foo.e $'x\by' $ cat foo.config [foo] a = x\"y b = x\\y c = x\ny d = x\ty e = y That last line is my shell interpreting the backspace byte: $ python -c 'print repr(open("foo.config").read())' '[foo]\n\ta = x\\"y\n\tb = x\\\\y\n\tc = x\\ny\n\td = x\\ty\n\te = x\x08y\n' Change-Id: I1b059e1afb544c39ddb587c07bf79a06e99d0a09
* | | Merge branch 'stable-4.9'Dave Borowitz2017-12-211-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | * stable-4.9: Make PackInserter public Change-Id: I367c6111661f3005419e2becd695e04e65202f97
| * Make PackInserter publicDave Borowitz2017-12-211-1/+1
| | | | | | | | | | | | | | | | The intent with the setCompressionLevel and checkExisting methods (which are already public) is for callers to be able to call them, but they can't do that if the class itself is not public. Change-Id: I014044fec3bfa1d33775500345efd60eb5d45bde
* | Fix remaining javadoc errors raised by doclintMatthias Sohn2017-12-2129-62/+63
| | | | | | | | | | | | | | For now ignore doclint "missing" warnings. Change-Id: I0e5af7a757f4d92ffeeb113f30576a35414d6781 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Update last jgit release version to 4.9.2.201712150930-rMatthias Sohn2017-12-211-1/+1
| | | | | | | | | | Change-Id: I57ff69d2fdfe0b3e694f51ed01c0423343c2d14d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc in org.eclipse.jgit util packagesMatthias Sohn2017-12-2056-386/+876
| | | | | | | | Change-Id: Ia655f45153bcf1d422ffffce6dcf914847e14c4c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc in org.eclipse.jgit treewalk packageMatthias Sohn2017-12-2021-243/+476
| | | | | | | | Change-Id: I1f9d9a005c7228c9881762a78228accad2c7a6d4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc in org.eclipse.jgit transport packageMatthias Sohn2017-12-20109-755/+1807
| | | | | | | | Change-Id: Id70e2c27e38bf12f87e66b28fbd0b06908494764 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-4.9'Dave Borowitz2017-12-203-34/+156
|\| | | | | | | | | | | | | | | * stable-4.9: PackInserter: Ensure objects are written at the end of the pack ObjectInserter: Add warning about mixing read-back with writes Change-Id: I308e7c1c6b72e8d4d9b5d0f4f51e9815fc92d7d7
| * PackInserter: Ensure objects are written at the end of the packDave Borowitz2017-12-202-34/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When interleaving reads and writes from an unflushed pack, we forgot to reset the file pointer back to the end of the file before writing more new objects. This had at least two unfortunate effects: * The pack data was potentially corrupt, since we could overwrite previous portions of the file willy-nilly. * The CountingOutputStream would report more bytes read than the size of the file, which stored the wrong PackedObjectInfo, which would cause EOFs during reading. We already had a test in PackInserterTest which was supposed to catch bugs like this, by interleaving reads and writes. Unfortunately, it didn't catch the bug, since as an implementation detail we always read a full buffer's worth of data from the file when inflating during readback. If the size of the file was less than the offset of the object we were reading back plus one buffer (8192 bytes), we would completely accidentally end up back in the right place in the file. So, add another test for this case where we read back a small object positioned before a large object. Before the fix, this test exhibited exactly the "Unexpected EOF" error reported at crbug.com/gerrit/7668. Change-Id: I74f08f3d5d9046781d59e5bd7c84916ff8225c3b
| * ObjectInserter: Add warning about mixing read-back with writesDave Borowitz2017-12-201-0/+7
| | | | | | | | Change-Id: Ib0460d3c7df315d86f9adca5f66a8fd4c39e4060
* | Fix javadoc leftovers in org.eclipse.jgit api packageMatthias Sohn2017-12-202-4/+3
| | | | | | | | | | | | Change-Id: I2150889b5ed04e8739e2367fc9023b750b516398 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Remove unused importsMatthias Sohn2017-12-202-3/+0
| | | | | | | | | | | | Change-Id: I35370c66e54d93d9b0aa3995e300706956ec0923 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Replace explicit calls to initCause where possibleDavid Pursehouse2017-12-2011-54/+34
| | | | | | | | | | | | | | | | | | Where the exception being thrown has a constructor that takes a Throwable, use that instead of instantiating the exception and then explicitly calling initCause. Change-Id: I06a0df407ba751a7af8c1c4a46f9e2714f13dbe3 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Merge changes I50095928,Idadec0ab,I1f2747d6,I6d2a7e28David Pursehouse2017-12-199-52/+64
|\ \ | | | | | | | | | | | | | | | | | | | | | * changes: LargeObjectException: Add constructor that takes Throwable InvalidPatternException: Add constructor that takes Throwable Don't unnecessarily explicitly call CorruptObjectException#initCause Use new StoredObjectRepresentationNotAvailableException constructor
| * | LargeObjectException: Add constructor that takes ThrowableDavid Pursehouse2017-12-192-3/+12
| | | | | | | | | | | | | | | Change-Id: I500959286075f8ba4d0aa5820febd28c9c94ea1b Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | InvalidPatternException: Add constructor that takes ThrowableDavid Pursehouse2017-12-192-4/+19
| | | | | | | | | | | | | | | Change-Id: Idadec0abc1c6d76f19f51a65a4b45df444c20486 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | Don't unnecessarily explicitly call CorruptObjectException#initCauseDavid Pursehouse2017-12-194-24/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | CorruptObjectException has a constructor that takes Throwable and calls initCause with it. Use that instead of instantiating the exception and explicitly calling initCause. Change-Id: I1f2747d6c4cc5249e93401b9787eb4ceb50cb995 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | Use new StoredObjectRepresentationNotAvailableException constructorDavid Pursehouse2017-12-193-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5e7eed4 a new StoredObjectRepresentationNotAvailableException constructor was added, that takes a Throwable to initialize the exception cause. Update more call sites to use this constructor instead of first instantiating it and explicitly calling initCause(). All callers now use the new constructor, so annotate the other one as deprecated. Change-Id: I6d2a7e289a95f0360ddebf904cfd8b6c18fef10c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Fix javadoc in org.eclipse.jgit submodule packageMatthias Sohn2017-12-192-37/+75
| | | | | | | | | | | | Change-Id: Idc2a32a2e10d1cfc0b23a4f3fd1bf29840724336 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Fix javadoc in org.eclipse.jgit storage/file and pack packageMatthias Sohn2017-12-195-41/+169
| | | | | | | | | | | | Change-Id: If1fee165782823dc21d896073f60ee838365463d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Fix javadoc in org.eclipse.jgit revwalk packageMatthias Sohn2017-12-1940-256/+487
| | | | | | | | | | | | Change-Id: I3fabab8afa284b1919ab7bc656cab19e56ed474e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Fix javadoc in org.eclipse.jgit patch and revplot packageMatthias Sohn2017-12-1910-61/+236
| | | | | | | | | | | | Change-Id: I6f1aba98bf7034cb51494c546806cf1b72dd1473 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Fix javadoc in org.eclipse.jgit nls and notes packageMatthias Sohn2017-12-198-71/+94
| | | | | | | | | | | | Change-Id: I1b65fba5b4856f98974dc10f549540d401ef916f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Fix javadoc in org.eclipse.jgit merge packageMatthias Sohn2017-12-1916-105/+209
|/ / | | | | | | Change-Id: I735d0f2e9f10531ed43b7b3dd6314c574392422f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc in org.eclipse.jgit lib packageMatthias Sohn2017-12-1964-550/+1215
| | | | | | | | Change-Id: I1e85a951488177993521ce177fdea212615e6164 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc in org.eclipse.jgit storage/reftree packageMatthias Sohn2017-12-198-37/+105
| | | | | | | | Change-Id: Ie206b5340ad2019a1e0bd2bcede2c1e5a279f2d5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc in org.eclipse.jgit storage/reftable packageMatthias Sohn2017-12-1911-57/+215
| | | | | | | | Change-Id: I14764c5d5b2309d82fe2ccc0593120b51328bf41 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc in org.eclipse.jgit storage/pack packageMatthias Sohn2017-12-1910-125/+258
| | | | | | | | Change-Id: Id1b7d392e1bb36079edaf16450e73a044a318e7e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc in org.eclipse.jgit storage/io packageMatthias Sohn2017-12-191-2/+3
| | | | | | | | Change-Id: I2db781311af79510b26fd05cc0556623e75e3eff Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc in org.eclipse.jgit storage/file packageMatthias Sohn2017-12-1950-166/+473
| | | | | | | | Change-Id: Ieb2f66aef2cab7e2a6d8e35c5f5047da881994dd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc in org.eclipse.jgit dfs packageMatthias Sohn2017-12-1938-160/+647
| | | | | | | | Change-Id: I1f5e3dc3ba34b323ee7244dbefee207ce19e6021 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>