summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
Commit message (Collapse)AuthorAgeFilesLines
* Prepare 3.2.0-SNAPSHOT buildsMatthias Sohn2013-10-033-35/+35
| | | | | Change-Id: Iac6cf7a5bb6146ee3fe38abe8020fc3fc4217584 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-3.1'Matthias Sohn2013-10-036-40/+46
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.1: Prepare post 3.1.0 builds JGit v3.1.0.201310021548-r Fix order of commits in rebase todo file header Prepare post 3.1.0 RC1 builds JGit v3.1.0.201309270735-rc1 Attempt to fix graph layout when new heads are introduced Prepare re-signing pgm's ueberjar to avoid SecurityException Use full branch name when getting ref in BranchTrackingStatus Change-Id: Ida30175d0c058048cbe4b563aae7f85cd008db29 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.1.0 buildsstable-3.1Matthias Sohn2013-10-033-35/+35
| | | | | | | | | | Change-Id: I306a3d40c6ddb88a16d17f09a60e3d19b0716962 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.1.0.201310021548-rv3.1.0.201310021548-rMatthias Sohn2013-10-023-4/+4
| | | | | | | | | | Change-Id: I2170b13047d5eab7565f47f9feb1680e03b1ba09 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Fix order of commits in rebase todo file headerStefan Lay2013-09-291-2/+2
| | | | | | | | Change-Id: I0e41d89bbd4fc01ad3b3d05a45ee60af853bfae7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.1.0 RC1 buildsMatthias Sohn2013-09-273-3/+3
| | | | | | | | | | Change-Id: I060f2082ccd0c91905b6b29a49cc633a0b51a1f2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.1.0.201309270735-rc1v3.1.0.201309270735-rc1Matthias Sohn2013-09-273-3/+3
| | | | | | | | | | Change-Id: I48202dd461110da25f9bc159c938311fff0669e0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Attempt to fix graph layout when new heads are introducedRobin Rosenberg2013-09-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | Sometime the new commit is no allocated onto a new lane leading to the commit being drawn on the wrong branch and something that looks like a merge. The drawback is that this also changes existing valid graphs. Bug: 368927 Change-Id: Ic8a8247c8a53be802c1be83850ed766b902ca646
| * Use full branch name when getting ref in BranchTrackingStatusRobin Stocker2013-09-201-2/+4
| | | | | | | | | | | | | | | | | | | | In case there is both a tag and branch called "foo", the tag is returned if calling getRef with the short name. By using refs/heads/foo, the branch is returned. Bug: 417158 Change-Id: I86b4f83955586bb24774fd621f5012499cf67909 Signed-off-by: Robin Stocker <robin@nibor.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Added the git-describe implementation"Matthias Sohn2013-10-024-0/+293
|\ \
| * | Added the git-describe implementationKohsuke Kawaguchi2013-09-274-0/+293
| |/ | | | | | | | | | | | | | | | | | | CQ: 7609 Bug: 339246 Change-Id: I689bc0578ce3a430b9800ad84122e221c69829f4 Signed-off-by: Kohsuke Kawaguchi <kk@kohsuke.org> Also-By: Robin Stocker<robin@nibor.org> Also-By: Matthias Sohn <matthias.sohn@sap.com> Also-By: Christian Halstrick <christian.halstrick@sap.com>
* / 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
* 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-132-57/+86
| | | | | | | | | | | | | 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-111-1/+0
|\ | | | | | | | | | | | | | | | | * 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-113-34/+34
| | | | | | | | | | Change-Id: Ie1bd951a2cb35d069c94dab4a62507115913764f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.2.201311090911-rv3.0.2.201311090911-rMatthias Sohn2013-09-113-3/+3
| | | | | | | | | | Change-Id: Ifaae2e3e2f1bb0504bf9e6d59983086ac19a540b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Don't treat "/" as valid ignore patternRobin Stocker2013-09-091-1/+1
| | | | | | | | | | | | | | | | This matches the behavior of C Git. Bug: 415767 Change-Id: Ifa6500f3f6a033da40c48287630b77c47b15f4a0 Signed-off-by: Robin Stocker <robin@nibor.org>
* | 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-041-2/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | * 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-043-3/+3
| | | | | | | | | | Change-Id: I0e4020326c6443ba7157c18b345160cf9e1e88a7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.2.201309041250-rc2v3.0.2.201309041250-rc2Matthias Sohn2013-09-043-3/+3
| | | | | | | | Change-Id: Ie18ced75f573f140969af2a7d9edb45c76523715 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Update build to use CBI jarsigner pluginMatthias Sohn2013-09-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 reflog like C Git during rebase (non-interactive)Robin Rosenberg2013-08-212-13/+40
| | | | | | | | | | | | 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>
| * Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilterRobin Stocker2013-08-211-3/+7
| | | | | | | | | | | | | | | | | | | | | | * 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>
| * 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-211-5/+4
| | | | | | | | | | | | | | | | | | 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-211-17/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Recognize CRLF when parsing the short message of a commit or tagRobin Rosenberg2013-08-214-5/+35
| | | | | | | | | | Bug: 400707 Change-Id: I9b09bb88528af465018fc0278f5441f7e6b75986
| * Prepare 3.0.2-SNAPSHOT buildsMatthias Sohn2013-08-193-34/+34
| | | | | | | | | | Change-Id: I3287609a90f068017cc62f4fd7738651e0663081 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.0.201306101825-r buildsMatthias Sohn2013-06-133-3/+3
| | | | | | | | | | Change-Id: I299cf1addc0987ffe39140d2216ab6a98e95ce52 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.0.201306101825-rv3.0.0.201306101825-rMatthias Sohn2013-06-113-3/+3
| | | | | | | | | | Change-Id: Ie8deab94c6263b5198f0bcb4533b1cfb3f5724b1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare post 3.0.0 RC3 buildsMatthias Sohn2013-06-043-3/+3
| | | | | | | | | | Change-Id: I008d55e2ef0aac9d1877b05ba73e3cf26335d430 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.0.0.201306040240-rc3v3.0.0.201306040240-rc3Matthias Sohn2013-06-043-3/+3
| | | | | | | | | | Change-Id: I8b782e9ebe03e5f72611a21a76d80c6b20cb7845 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>
* | Enable LsRemoteCommand to work without local repositoryRobin Stocker2013-08-132-1/+18
| | | | | | | | | | | | | | | | 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-104-5/+35
|\ \
| * | Recognize CRLF when parsing the short message of a commit or tagRobin Rosenberg2013-06-144-5/+35
| | | | | | | | | | | | | | | Bug: 400707 Change-Id: I9b09bb88528af465018fc0278f5441f7e6b75986
* | | Merge "Added characters to be escaped in file name patterns"Robin Rosenberg2013-08-101-20/+44
|\ \ \
| * | | Added characters to be escaped in file name patternsGustav Karlsson2013-04-061-20/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Send no-progress option with NullProgressMonitor.Colby Ranger2013-08-051-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The NullProgressMonitor does not report progress anywhere. Inform the server not to send progress by enabling the no-progress capability. Change-Id: Id18dbc754c814d1a5534a284c947030bf201c569
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 06:09:21 +0000