aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix javadoc in org.eclipse.jgit ketch packageMatthias Sohn2017-12-1818-130/+380
| | | | Change-Id: I72be0a0d5ac7d3e957597803bd103dbbec141ba4
* Fix javadoc in org.eclipse.jgit internal and fsck packagesMatthias Sohn2017-12-183-9/+54
| | | | Change-Id: Ib12da10aacda9389d594bf4f521e9a58d1935701 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit ignore packageMatthias Sohn2017-12-1811-16/+55
| | | | Change-Id: I1a81d371420cd4cf90ab9e048026c0ab8a763018 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit hooks packageMatthias Sohn2017-12-186-7/+54
| | | | Change-Id: I3b644048eb0fc19f94ba8f9799b5a2310481103f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit gitrepo packageMatthias Sohn2017-12-184-6/+49
| | | | Change-Id: I2604c7bca87f005004d6d6c80fa9a39a7a1e3807 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit fnmatch packageMatthias Sohn2017-12-188-11/+44
| | | | Change-Id: I14384c3bf3c41f8e1c62ec117837c2fc782a832f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit events packageMatthias Sohn2017-12-1812-26/+66
| | | | Change-Id: Ifcb9c67daeb9da84a1461a4f731523ac5df3a223 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit errors packageMatthias Sohn2017-12-1831-47/+156
| | | | Change-Id: I46aa5c3073b99a311a1a97fc57d8f29d32524482 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit dircache packageMatthias Sohn2017-12-1810-92/+153
| | | | Change-Id: Ib485eb217ac6be70519816f8cc0396931043a3d1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* EmtpyCommitException: Add TODO to fix misspelled class name in 5.0David Pursehouse2017-12-181-1/+1
| | | | | Change-Id: I5bb145d6d6cbaaa2d8cfb2febad7a008ca921236 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Merge "PushConnectionTest: Increase maxCommandBytes yet again"Christian Halstrick2017-12-181-1/+1
|\
| * PushConnectionTest: Increase maxCommandBytes yet againDavid Pursehouse2017-12-181-1/+1
| | | | | | | | | | | | | | | | | | It was already increased in 61a943e and 661232b but is still not enough to take into account snapshot versions that are 100 or more commits ahead of tag, i.e. 4.9.2.201712150930-r.105-gc1d37ca27 Change-Id: Ibeff73adae06b92fe5bb9c5eced9e4c6a08c437c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Merge changes I7162d729,I2761ea91David Pursehouse2017-12-18115-883/+1720
|\ \ | | | | | | | | | | | | | | | * changes: Fix javadoc org.eclipse.jgit diff package Fix javadoc in org.eclipse.jgit annotations and api packages
| * | Fix javadoc org.eclipse.jgit diff packageMatthias Sohn2017-12-1822-160/+333
| | | | | | | | | | | | Change-Id: I7162d72916abc8533ad37e8b17335ff4a70d6519 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | Fix javadoc in org.eclipse.jgit annotations and api packagesMatthias Sohn2017-12-1893-723/+1387
| | | | | | | | | | | | Change-Id: I2761ea91f8dfed16ea54e7a6646af03a30c15ec9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Repeat: Fix javadoc to say 'annotation' instead of 'interface'"Christian Halstrick2017-12-181-1/+1
|\ \ \ | | |/ | |/|
| * | Repeat: Fix javadoc to say 'annotation' instead of 'interface'David Pursehouse2017-12-181-1/+1
| | | | | | | | | | | | | | | Change-Id: Ib0c4ec28d6b7e2fc0fe71f7dc53dd12ccd6e8a2f Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Merge "Remove redundant @SuppressWarnings("unused")"Christian Halstrick2017-12-182-9/+5
|\| |
| * | Remove redundant @SuppressWarnings("unused")David Pursehouse2017-12-182-9/+5
| | | | | | | | | | | | | | | | | | | | | These are now redundant since the parameters have javadoc. Change-Id: I6bfde267e1712ee35871c30c8203c3b4dc5e136a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | Merge "PathTreeFilterHandler: Remove unused import"Christian Halstrick2017-12-181-1/+0
|\| | | |/ |/|
| * PathTreeFilterHandler: Remove unused importDavid Pursehouse2017-12-181-1/+0
| | | | | | | | | | Change-Id: I7a91210dcb775d0c9b46772f8ff3d84196ba3b10 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Fix javadoc in org.eclipse.jgit blame packageMatthias Sohn2017-12-175-31/+100
| | | | | | | | Change-Id: I116dacc7f4ace341ec6ffae2ab96b53496d89f64 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc in org.eclipse.jgit attributes packageMatthias Sohn2017-12-1710-81/+171
|/ | | | Change-Id: I12968f4be805266f285a518a014b8bd1d0c23bae Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit.uiMatthias Sohn2017-12-186-5/+31
| | | | Change-Id: Iec68c73fc0d8d26fdb26850354059ea521ac7fe5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit.pgmMatthias Sohn2017-12-1876-42/+329
| | | | Change-Id: I74616f6e8ef69bef4db2f13a9b47ddf57714fd1f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit.lfs.serverMatthias Sohn2017-12-1711-66/+98
| | | | Change-Id: I0c52536ebeeb8e71d95c6420f6db7055ff082dfa Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit.lfsMatthias Sohn2017-12-1724-84/+190
| | | | Change-Id: I97b53c083da6aa31719d9e10369030ee33dd23dc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit.junitMatthias Sohn2017-12-1711-22/+323
| | | | | Change-Id: I1107e6a82849ac329361baabb5c481d86ea6dc9e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit.junit.httpMatthias Sohn2017-12-177-16/+284
| | | | | Change-Id: I8af6d07676a285f79635405e5891535a5adfd7e9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit.http.testMatthias Sohn2017-12-172-3/+7
| | | | | Change-Id: Ibd18dfed05d35bd70498d11c04c026a34114a87e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit.http.serverMatthias Sohn2017-12-1731-64/+204
| | | | | Change-Id: I732d773b21bbf64285493070964dd9e442eab5d8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit.http.apacheMatthias Sohn2017-12-174-7/+52
| | | | | Change-Id: I38a4854856b0103790a410b48c1c3d708b6500c1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit.archiveMatthias Sohn2017-12-178-40/+45
| | | | | Change-Id: Ibef80b15f17e884f3085e324283cefc738236a4d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix javadoc in org.eclipse.jgit.antMatthias Sohn2017-12-174-1/+22
| | | | | Change-Id: I97231080ebe040ad44f7189de6109b9626424d2f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Upgrade maven-javadoc-plugin to 3.0.0David Pursehouse2017-12-161-1/+3
| | | | | | | | | | | This version seems to be much stricter and reports a lot more errors in the javadoc formatting. Disable failOnError to prevent the build from failing due to these newly reported problems. These should be fixed in a follow-up commit. Change-Id: Ia403cbedf72cfe8bdaf09f30e42e3bf96084ae52 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Upgrade maven-surefire{-report}-plugin to 2.20.1David Pursehouse2017-12-161-2/+2
| | | | | Change-Id: If3979b36ac0e1fd66f31f8a92e76b0e47d066a3b Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Upgrade maven-dependency-plugin to 3.0.2David Pursehouse2017-12-161-1/+1
| | | | | Change-Id: I1ed9f0e0ebdcadc4ddc56a78894b3a4220ae26ac Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Upgrade maven-shade-plugin to 3.1.0David Pursehouse2017-12-161-1/+1
| | | | | Change-Id: I14d746dfbfcea0d87378894b74c0cd673253f566 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* Merge branch 'stable-4.9'David Pursehouse2017-12-162-5/+37
|\ | | | | | | | | | | | | | | | | | | * stable-4.9: Prepare 4.9.3-SNAPSHOT builds JGit v4.9.2.201712150930-r Write packed-refs directly when cloning Change-Id: I3b0fad9c45cdf3a918ddb8ea4a37b8d3403aae90 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 4.9.3-SNAPSHOT buildsMatthias Sohn2017-12-1656-333/+333
| | | | | | | | | | Change-Id: Ife3f2b0b5407227f89ded42358adbf01d53e14cf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v4.9.2.201712150930-rv4.9.2.201712150930-rMatthias Sohn2017-12-1556-59/+59
| | | | | | | | | | Change-Id: I013964045d532659a4be3b81d6612b59bc9ffb14 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Write packed-refs directly when cloningThomas Wolf2017-12-152-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we are cloning we have no refs at all yet, and there cannot (or at least should not) be any other thread doing something with refs yet. Locking loose refs is thus not needed, since there are no loose refs yet and nothing should be trying to create them concurrently. Let's skip the whole loose ref locking when we are cloning a repository. As a result, JGit will write the refs directly to the packed-refs file, and will not create the refs/remotes/ directories nor the lock files underneath when cloning and packed refs are used. Since no lock files are created, any problems on case-insensitive file systems with tag or branch names that differ only in case are avoided during cloning. Detect if we are cloning based on the following heuristics: * HEAD is a dangling symref * There is no loose ref * There is no packed-refs file Note, however, that there may still be problems with such tag or branch names later on. This is primarily a five-minutes-past-twelve stop-gap measure to resolve the referenced bug, which affects the Oxygen.2 release. Bug: 528497 Change-Id: I57860c29c210568165276a123b855e462b6a107a Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | DfsFsck: Skip unborn branches and symrefs to nowhereZhen Chen2017-12-151-2/+8
| | | | | | | | | | | | | | | | | | | | The map returned by getAllRefs includes all refs, including symrefs like HEAD that may not point to any object yet. That is a valid state (e.g., in a new repository that has just been created by "git init"), so skip such refs. Change-Id: Ieff8a1aa738b8d09a2990d075eb20601156b70d3 Signed-off-by: Zhen Chen <czhen@google.com>
* | ConfigTest: Remove redundant assignmentDavid Pursehouse2017-12-151-2/+1
| | | | | | | | | | Change-Id: Ia913dbe6b7ad4b7000525fda8ca08cbc8dd87da6 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Merge branch 'stable-4.9'David Pursehouse2017-12-150-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * stable-4.9: Config: Remove the include functionality Merged with "-s ours" because the fix on stable conflicts with the fix already done here. Change-Id: I85e394422d5dc40ca33ed3a78ddbf5cd1da1664a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * Config: Remove the include functionalityDavid Pursehouse2017-12-152-55/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Config class must be safe to run against untrusted input files. Reading arbitrary local system paths using include.path is risky for servers, including Gerrit Code Review. This was fixed on master [1] by making "readIncludedConfig" a noop by default. This allows only FileBasedConfig, which originated from local disk, to read local system paths. However, the "readIncludedConfig" method was only introduced in [2] which was needed by [3], both of which are only on the master branch. On the stable branch only Config supports includes. Therefore this commit simply disables the include functionality. [1] https://git.eclipse.org/r/#/c/113371/ [2] https://git.eclipse.org/r/#/c/111847/ [3] https://git.eclipse.org/r/#/c/111848/ Bug: 528781 Change-Id: I9a3be3f1d07c4b6772bff535a2556e699a61381c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Merge branch 'stable-4.9'David Pursehouse2017-12-141-1/+1
|\| | | | | | | | | | | | | | | * stable-4.9: InMemoryRepository: Make inner class MemObjDatabase static Change-Id: I62bb5957de1ae3bc6030ea2181b09efccc48252b Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * InMemoryRepository: Make inner class MemObjDatabase staticDavid Pursehouse2017-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | FindBugs reports: This class is an inner class, but does not use its embedded reference to the object which created it. This reference makes the instances of the class larger, and may keep the reference to the creator object alive longer than necessary. If possible, the class should be made static. Change-Id: I9f49de32b4cd81b7ef1239b390353689263bf66e Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | Make Config.readIncludedConfig a noop by defaultShawn Pearce2017-12-132-33/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | The Config class must be safe to run against untrusted input files. Reading arbitrary local system paths using include.path is risky for servers, including Gerrit Code Review. Return null by default to incide the include should be ignored. Only FileBasedConfig which originated from local disk should be trying to read local system paths. FileBasedConfig already overrides this method with its own implementation. Change-Id: I2ff31753868aa1bbac4a6843a4c23e50bd6f46f3
* | DfsBlockCache.hasBlock0: quickly check for file in cacheShawn Pearce2017-12-131-0/+17
| | | | | | | | | | | | | | | | This can be useful for sophisticated pre-read algorithms to quickly determine if a file is likely already in cache, especially small reftables which may be smaller than a typical DFS block size. Change-Id: I7756948063b722ff650c9ba82060ff9ad554b0ba