summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Do not close ArchiveOutputStream on errorJonathan Nieder2013-09-231-2/+2
|/ | | | | | | | | | | | | | | | | | | | If we encounter an I/O error while writing an archive (for example due to the reader of an HTTP stream closing the connection), the result is an archive with unclosed entries, causing TarArchiveOutputStream.finish() to throw IOException("This archives contains unclosed entries"), hiding the IOException that caused the early termination. The unclosed entries are fine: the same exception that occured in the first place will probably prevent closing the entries before finishing this partial archive that should be discarded anyway. It would be nicer to call TarArchiveOutputStream.finish and leave the underlying OutputStream unclosed --- all callers close it already --- but that would be a more invasive change so we hold off for now. Change-Id: I328ced19aa8a1888e5353cdbb6106a85fd72d5d7 Signed-off-by: Jonathan Nieder <jrn@google.com>
* Ignore bitmap indexes that do not match the pack checksumColby Ranger2013-09-191-8/+8
| | | | | | | | | | If `git gc` creates a new pack with the same file name, the pack checksum may not match that in the .bitmap. Fix the PackFile implementaion to silently ignore invalid bitmap indexes. Fixes Issue https://code.google.com/p/gerrit/issues/detail?id=2131 Change-Id: I378673c00de32385ba90f4b639cb812f9574a216
* Merge branch 'stable-3.0'Matthias Sohn2013-09-173-2/+12
|\ | | | | | | | | | | | | | | * stable-3.0: JGit v3.0.3.201309161630-r Add org.eclipse.jgit.java7.source to jgit source feature Change-Id: I738afcfbc78ea1ac56d0d0ab7d4f7717167dd8dd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.3.201309161630-rv3.0.3.201309161630-rstable-3.0Matthias Sohn2013-09-1648-51/+51
| | | | | | | | | | Change-Id: I73ff609ba681500394b5919f62cff9ec24a52756 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Add org.eclipse.jgit.java7.source to jgit source featureMatthias Sohn2013-09-162-0/+12
| | | | | | | | Change-Id: Ifd9153f77c246a67d5d15734667dc2360718a390 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Remove unneeded packs when compacting with no new objectsColby Ranger2013-09-161-1/+7
| | | | | | | | | | | | | | Previously, the DfsPackCompactor exited without pruning the existing packs, when no new packs were created. Change-Id: I5e3b6f8c789706c7a982e6ae93cf7c3d4346797c
* | ResetCommand: Allow reset on unborn branch when ref not specifiedRobin Stocker2013-09-133-58/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | In C Git 1.8.2, "git reset" now also works on an unborn branch (no HEAD yet) if no explicit ref was specified. In that case, it is treated as a reset to an empty tree. This can be useful for callers because "unborn branch" no longer has to be special-cased to "git rm --cached". Bug: 414870 Change-Id: Ied750116f767518ae4d48823cf00752b049a8477 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge branch 'stable-3.0'Matthias Sohn2013-09-116-3/+25
|\| | | | | | | | | | | | | | | | | * stable-3.0: Prepare post 3.0.2 builds JGit v3.0.2.201311090911-r Change-Id: I99a7d1072285646f7fcd4169225c1fd249ad5e37 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.2 buildsMatthias Sohn2013-09-1148-230/+230
| | | | | | | | | | Change-Id: Ie1bd951a2cb35d069c94dab4a62507115913764f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.2.201311090911-rv3.0.2.201311090911-rMatthias Sohn2013-09-1148-48/+48
| | | | | | | | | | Change-Id: Ifaae2e3e2f1bb0504bf9e6d59983086ac19a540b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Don't treat "/" as valid ignore patternRobin Stocker2013-09-092-1/+12
| | | | | | | | | | | | | | | | This matches the behavior of C Git. Bug: 415767 Change-Id: Ifa6500f3f6a033da40c48287630b77c47b15f4a0 Signed-off-by: Robin Stocker <robin@nibor.org>
* | Merge "Add missing usage texts for JGit commandline commands"Matthias Sohn2013-09-0922-12/+73
|\ \
| * | Add missing usage texts for JGit commandline commandsMatthias Sohn2013-09-0922-12/+73
| | | | | | | | | | | | | | | | | | | | | Also update help text for the merge command now supporting recursive strategy as the default merge strategy. Change-Id: I07886fe875c407e2244f562c003bb9d04f398026 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Add missing dependency for testing ArchiveCommand with xz compressionMatthias Sohn2013-09-081-0/+1
|/ / | | | | | | | | | | | | Without this dependency the ArchiveTest.testTxzExtension() fails with a ClassNotFoundException if it is started from Eclipse. Change-Id: Ief2fceaaffab7641ba63ace4577462fa3bbf1c13 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Remove unnecessary inflate stride in DfsBlock"Shawn Pearce2013-09-042-43/+17
|\ \
| * | Remove unnecessary inflate stride in DfsBlockShawn Pearce2013-09-042-43/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenJDK 7 does not benefit from using an inflate stride on the input array. The implementation of java.util.zip.Inflater supplies the entire input byte[] to libz, with no regards for the bounds supplied. Slicing at 512 byte increments in DfsBlock no longer has any benefit. In OpenJDK 6 the native portion of Inflater used GetByteArrayRegion to obtain a copy of the input buffer for libz. In this use case supplying a small stride made sense, it avoided allocating space for and copying data past the end of the object's compressed stream. In OpenJDK 7 the native code uses GetPrimitiveArrayCritical, which tries to avoid copying by freezing Java garbage collection and accessing the byte[] contents in place. On OpenJDK 7 derived JVMs it is likely more efficient to supply the entire DfsBlock. Since OpenJDK 5 and 6 are deprecated and replaced by OpenJDK 7 it is reasonable to suggest any consumers running JGit with DFS support use an OpenJDK 7 derived JVM. However, JGit still targets local filesystem support on Java 5, so it is still not reasonble to apply this same simplification to the internal.storage.file package. See: JDK-6751338 (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6751338) Change-Id: Ib248b6d383da5c8aa887d9c355a0df6f3e2247a5
* | | Merge branch 'stable-3.0'Matthias Sohn2013-09-049-34/+326
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | * stable-3.0: Prepare post 3.0.2-rc2 builds JGit v3.0.2.201309041250-rc2 Uncomment eclipse-jar-signer plugin Update build to use CBI jarsigner plugin Update maven plugins Update to Orbit Kepler SR1 release R20130827064939 Change-Id: Iaa8bba21c300dd1de2b91a77cddf6727fbc66340 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.2-rc2 buildsMatthias Sohn2013-09-0448-48/+48
| | | | | | | | | | Change-Id: I0e4020326c6443ba7157c18b345160cf9e1e88a7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.2.201309041250-rc2v3.0.2.201309041250-rc2Matthias Sohn2013-09-0448-48/+48
| | | | | | | | Change-Id: Ie18ced75f573f140969af2a7d9edb45c76523715 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Uncomment eclipse-jar-signer pluginMatthias Sohn2013-09-041-2/+2
| | | | | | | | | | | | This was commented out by mistake. Change-Id: Ia1f6518ab7c7466d11710225f815b755fbf4d387 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Update build to use CBI jarsigner pluginMatthias Sohn2013-09-048-7/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dash signing plugin has been retired hence we need to update our build to use the CBI jarsigner plugin for signing build results. Pack test classes to enable signing them. Also re-enable pack200 for bundle org.eclipse.jgit. WORKAROUND: there is no easy way to run tests with maven-surefire-plugin from signed test-jar so for a quick workaround we will have to add a build step on Hudson so that we can run tests before signing: - first step will do "clean, verify" to compile and run tests - second step will do "install, deploy" with profile "eclipse-sign" and use -DskipTests=true to skip tests since they would hit a SecurityException when unsigned test classes are in same package as signed classes under test - third step will do "clean, install, deploy" on packaging reactor to build features and p2 repository with profile "eclipse-sign" to sign and pack200 all bundles. TODO: Tycho doesn't suport picking up pack200 artifacts via pomDependencies hence we need to find a way to copy them manually and use tycho-extra's tycho-p2-extras-plugin:publish-features-and-bundles to generate the missing p2 metadata. Change-Id: Iec2c5ab3027a3e3f9ecc0d2f99193385177d9025 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Update maven pluginsMatthias Sohn2013-08-301-8/+8
| | | | | | | | | | Change-Id: Idda470ff355cc1ab559c3c64189e8b1df173dc55 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Update to Orbit Kepler SR1 release R20130827064939Matthias Sohn2013-08-282-19/+13
| | | | | | | | Change-Id: I6849fc5cb81e8ac47ce1b2c5a74737b23c089fc1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | LogCommand: Remove outdated TODO and improve docsRobin Stocker2013-08-251-3/+17
| | | | | | | | | | Change-Id: I368be12e7bdc3c711e9f474ead312006513764b7 Signed-off-by: Robin Stocker <robin@nibor.org>
* | Merge branch 'stable-3.0'Matthias Sohn2013-08-221-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.0: Update reflog like C Git during rebase (non-interactive) Make sure checkout is not deleting folders outside the workingtree Update to Jetty 7.6.11.v20130520 Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilter Refactor PathSuffixFilterTest to remove duplication Check parentFile is not null Update HEAD in cherry-picking several commits Fix HTTP response processing for WWW-Authenticate headers Don't skip want validation when the client sends no haves Fix tests for OS X when the tmpdir is the default /tmp Fix running maven http tests on OS X Recognize CRLF when parsing the short message of a commit or tag Update build to use Tycho 0.18 Add jgit target platform to define dependencies more precisely Prepare 3.0.2-SNAPSHOT builds Change-Id: Icef0cd0cce9bbccf2b2cbb3471a3f4ce0655e22c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Update reflog like C Git during rebase (non-interactive)Robin Rosenberg2013-08-214-15/+131
| | | | | | | | | | | | Bug: 346350 Change-Id: I119766a00bc52a810c51cffaa19207cb8555ca22 Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
| * Make sure checkout is not deleting folders outside the workingtreeChristian Halstrick2013-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a chance that jgit deletes symbolic links which point to the folder on top of the working tree. Make sure not to touch these resources. Thanks to Cedric Darloy who reported this bug on http://www.eclipse.org/forums/index.php/m/776910/#msg_776910 and to Ondrej Vrabec who reported bug 412489. Bug: 412489 Change-Id: I81735ba0394ef6794e9b2b8bdd8bd7e8b9c6460f Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Robin Stocker <robin@nibor.org>
| * Update to Jetty 7.6.11.v20130520Matthias Sohn2013-08-212-18/+18
| | | | | | | | | | Change-Id: I76d32444c9cf9f086a013e410a88d37a359272fd Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilterRobin Stocker2013-08-212-3/+17
| | | | | | | | | | | | | | | | | | | | | | * It didn't check the first character in the pattern due to a off-by-one error. Spotted by James Roper. * It returned true even when pattern was longer than current path, e.g. it returned that ".txt" is suffix of "txt". Bug: 411999 Change-Id: I9fbcd68a11fb57cc49956b70c387a47271a0424f Signed-off-by: Robin Stocker <robin@nibor.org>
| * Refactor PathSuffixFilterTest to remove duplicationRobin Stocker2013-08-211-61/+31
| | | | | | | | | | | | | | Makes it possible to add new test cases without copying lots of lines. Change-Id: I66db3bc0cbd18fb5a07748905c60384b86b1c162 Signed-off-by: Robin Stocker <robin@nibor.org>
| * Check parentFile is not nullHiroshi Tomita2013-08-211-1/+1
| | | | | | | | | | | | | | | | | | parentFile becomes null when f is relative path, such as ".". This patch avoids NullPointerException in such case. Change-Id: I4752674b1daab6eedd7c3650c7749462810eaffd Signed-off-by: Hiroshi Tomita <tomykaira@gmail.com>
| * Update HEAD in cherry-picking several commitsHiroshi Tomita2013-08-212-5/+40
| | | | | | | | | | | | | | | | | | Without update, index is wrongly detected to be dirty when picking the second commit. Change-Id: Idf47ecb33e8bd38340d760806d629f67be92d2d5 Signed-off-by: Hiroshi Tomita <tomykaira@gmail.com> Bug: 411963
| * Fix HTTP response processing for WWW-Authenticate headersAlex Rukhlin2013-08-212-17/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original code was able to process only one WWW-Authenticate header in an HTTP response, and if this header was not one of two expected, authentication failed regardless of that there could be other headers in the response. All WWW-Authenticate headers in an HTTP response have to be browsed to find one of supported, i.e. Basic or Digest. By that if both are present, the Digest one should be used as more preferable. Bug: 357719 Change-Id: Icf601a41fec63f7d40308f3c85aaa4f71a7c095b Signed-off-by: Alex Rukhlin <arukhlin@microsoft.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Don't skip want validation when the client sends no havesDave Borowitz2013-08-211-2/+2
| | | | | | | | Change-Id: I5e80b3befca5cf1dcb06075862d6d48e6491cc0f
| * Fix tests for OS X when the tmpdir is the default /tmpRobin Rosenberg2013-08-214-5/+18
| | | | | | | | | | | | | | | | | | | | | | /tmp is a symbolic link and some tests break when the path gets canonicalized by JGit or Jetty. Allow Jetty to serve symlinks by setting init parameter "aliases" to true [1]. [1] http://wiki.eclipse.org/Jetty/Howto/How_to_serve_symbolically_linked_files Change-Id: I45359a40435e8a33def6e0bb6784b4d8637793ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Fix running maven http tests on OS XRobin Rosenberg2013-08-211-0/+8
| | | | | | | | | | | | | | | | In 36144e12d8 tests were changed to use the system tmp directory as defined by java.io.tmpdir, which was then overridden in the pom files to usea custom directory that made som tests work, but not all. Change-Id: I2fa04878f8830ad9c9b32a6f3fe8d2e2d66fe411
| * Recognize CRLF when parsing the short message of a commit or tagRobin Rosenberg2013-08-216-5/+60
| | | | | | | | | | Bug: 400707 Change-Id: I9b09bb88528af465018fc0278f5441f7e6b75986
| * Update build to use Tycho 0.18Matthias Sohn2013-08-211-1/+1
| | | | | | | | | | Change-Id: I66ffb2b6416dbbd5da11ad789dd58060b7ab09f2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Add jgit target platform to define dependencies more preciselyMatthias Sohn2013-08-217-23/+171
| | | | | | | | | | | | | | | | | | Avoid that the packaging build picks an older jgit version coming with eclipse platform by using a target platform which allows to define the dependencies more precisely. Change-Id: I39bba3baa4517e2b5e5fe0de096e756f2904e3e9 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 3.0.2-SNAPSHOT buildsMatthias Sohn2013-08-1946-228/+228
| | | | | | | | | | Change-Id: I3287609a90f068017cc62f4fd7738651e0663081 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Enable LsRemoteCommand to work without local repositoryRobin Stocker2013-08-133-2/+27
| | | | | | | | | | | | | | | | It's supported by C Git and can be useful. Bug: 413388 Change-Id: I12c6c10e791cc09ee271d89eb8b8d32f53e385db Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add missing @since tag for replaceLineBreaksWithSpaceRobin Stocker2013-08-121-0/+1
| | | | | | | | | | Change-Id: Ibd9d9ba609a2cd7707b985cdb07405dce0422aab Signed-off-by: Robin Stocker <robin@nibor.org>
* | Allow the command line bundle to access internal jgit packagesMatthias Sohn2013-08-111-2/+8
| | | | | | | | Change-Id: Id1e11a21fdcbd8cb0f2f8c22e7ab253e8df65d2f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Recognize CRLF when parsing the short message of a commit or tag"Robin Rosenberg2013-08-106-5/+60
|\ \
| * | Recognize CRLF when parsing the short message of a commit or tagRobin Rosenberg2013-06-146-5/+60
| | | | | | | | | | | | | | | Bug: 400707 Change-Id: I9b09bb88528af465018fc0278f5441f7e6b75986
* | | Merge "Added characters to be escaped in file name patterns"Robin Rosenberg2013-08-102-20/+84
|\ \ \
| * | | Added characters to be escaped in file name patternsGustav Karlsson2013-04-062-20/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, characters could not be escaped in FileNameMatcher patterns. This breaks file name matching when escaped brackets "\[" and "\]" are used in the pattern. A fix has been implemented to allow for any character to be escaped by prepending it with a '\' Bug: 340715 Change-Id: Ie46fd211931fa09ef3a6a712bd1da3d7fb64c5e3 Signed-off-by: Gustav Karlsson <gustav.karlsson@tieto.com>
* | | | Add missing @since tagsLars Vogel2013-08-103-0/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I9754e2124c0fe6ad2dbde5597c3ed10f1c3efef5 Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | Advertise capabilities with no refs in upload service.Colby Ranger2013-08-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With reference hiding, it is possible for a repository to appear empty when all refs are hidden. This causes capabilities to not be advertised either, since they are published with the first reference, breaking fetch by SHA1 support. Always advertise the capabilites by publishing the symbolic capabilities reference when the repository has no references to advertise (similar to the receive service). Change-Id: I8060e430ee03571dc51239e702864c85e888505c
* | | | Allow UploadPack requests with no optionsShawn Pearce2013-08-071-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadPack can be invoked with no capabilities selected by the client if the client is an ancient version of Git that nobody in their right mind should still be using. Or if the client is very broken and does not want to use any of the newer features added to the protocol since its inception. Change-Id: I3baa6f90e6a41a37a8eab8449a3cc41f4efcb91a
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-24 12:02:37 +0000