summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* Prepare post 3.0.0.201306101825-r buildsMatthias Sohn2013-06-1346-46/+46
| | | | | Change-Id: I299cf1addc0987ffe39140d2216ab6a98e95ce52 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v3.0.0.201306101825-rv3.0.0.201306101825-rMatthias Sohn2013-06-1146-46/+46
| | | | | Change-Id: Ie8deab94c6263b5198f0bcb4533b1cfb3f5724b1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Make JGit test work with both hamcrest 1.1 (juno) and 1.3 (kepler)Robin Rosenberg2013-06-094-9/+6
| | | | | | | The hamcrest library has moved things around. This problem applies only to the test, not plugin runtime. Change-Id: I5b97f356d8595dbdc9e91d157558e40561a6a30d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix version.sh to not overwrite ${project.version}Matthias Sohn2013-06-041-3/+10
| | | | | Change-Id: If5ae792581170bcba2dc1860012cbe389d8e9f24 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Prepare post 3.0.0 RC3 buildsMatthias Sohn2013-06-0446-46/+46
| | | | | Change-Id: I008d55e2ef0aac9d1877b05ba73e3cf26335d430 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v3.0.0.201306040240-rc3v3.0.0.201306040240-rc3Matthias Sohn2013-06-0446-58/+58
| | | | | Change-Id: I8b782e9ebe03e5f72611a21a76d80c6b20cb7845 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Prepare post 3.0.0-rc2 buildsMatthias Sohn2013-05-2946-58/+58
| | | | Change-Id: Ic46832bcde80d0bf74c16cb094abd76b00552d14 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v3.0.0.201305281830-rc2v3.0.0.201305281830-rc2Matthias Sohn2013-05-2946-58/+58
| | | | | Change-Id: I490ad8cc7590f70783d3fbd6dd6f0e0446ae5afe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Support refspecs with wildcard in middle (not only at end)Robin Stocker2013-05-284-19/+214
| | | | | | | | | | | | | | | The following refspec, which can be used to fetch GitHub pull requests, is supported by C Git but was not yet by JGit: +refs/pull/*/head:refs/remotes/origin/pr/* The reason is that the wildcard in the source is in the middle. This change also includes more validation (e.g. "refs//heads" is not valid) and test cases. Bug: 405099 Change-Id: I9bcef7785a0762ed0a98ca95a0bdf8879d5702aa
* Fix multiple bugs in RawSubStringPattern used by MessageRevFilterRobin Stocker2013-05-282-5/+109
| | | | | | | | | | * Match at end of input was not handled correctly. * When more than one character matched but not all, the next character was not considered as a match start (e.g. pattern "abab" didn't match input "abaabab"). Bug: 409144 Change-Id: Ia44682c618bfbb927f5567c194227421d222a160 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Handle short branch/tag name for setBranch in CloneCommandRobin Stocker2013-05-262-10/+48
| | | | | | | | | | | | | | Before, it was not clear from the documentation what kind of branch name was accepted. Users specifying "branch" (instead of "refs/heads/branch") got no error message and ended up with a repository without HEAD and no checkout. With this, CloneCommand now tries "$branch", then "refs/heads/$branch" and then "refs/tags/$branch". C Git only does the last two, but for compatibility we should still allow "refs/heads/branch". Bug: 390994 Change-Id: I4be13144f2a21a6583e0942f0c7c40da32f2247a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add missing Bundle-Localization headerMatthias Sohn2013-05-261-0/+1
| | | | Change-Id: I6831ad417f069127b4705fdd909844ec72065527 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Apply tree filter marks when pairing DiffEntry for renamesRobin Stocker2013-05-241-0/+2
| | | | | | | | | | When using a RenameDetector to generate new DiffEntries after using DiffEntry.scan, the treeFilterMarks of the original entries were lost. Now it combines the marks from src and dst. See EGit bug 335082 where this is used. Change-Id: I72b34b10ca12e3a6bd10ce44f4fa05b193fc52cc
* Improve feature names to become understandable by end usersMatthias Sohn2013-05-216-6/+6
| | | | | | | | | This was requested in [1]. [1] http://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg08981.html Change-Id: I9764961a651c1fa64042098d60da9b496453f703 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Update kepler orbit version to R20130517111416Matthias Sohn2013-05-201-1/+1
| | | | Change-Id: I635aaa28230d571f4b6bf65485edaba1b1561fc2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix BatchRefUpdate progress-monitoring so it doesn't count twiceRoberto Tyley2013-05-192-10/+32
| | | | | | | | | | | | | | | I was seeing output like this while running The BFG: Updating references: 200% (374/187) ...issue sneaked in with 5cf53fda I think. The update call is also moved to the end of the loop, as update() is only supposed to be called after work has been done ("Denote that some work units have been completed"). Change-Id: I1620fa75be16dc80df44745d0e123ea512762e31 Signed-off-by: Robin Stocker <robin@nibor.org>
* Merge "Fix DiffFormatter NPEs for DiffEntry without content change" into ↵Matthias Sohn2013-05-162-2/+36
|\ | | | | | | stable-3.0
| * Fix DiffFormatter NPEs for DiffEntry without content changeRobin Stocker2013-05-152-2/+36
| | | | | | | | | | | | | | | | DiffEntry.getOldId() returns null for a diff without an index line (e.g. only mode changed, rename without content change). Bug: 407743 Change-Id: I42eac87421f2a53c985af260a253338f578492bc
* | Fix AnyObjectId's generic type declaration of ComparableRoberto Tyley2013-05-161-5/+1
|/ | | | | | | | | | | | | | | | | | | | | If you look at any implementation of Comparable in the JDK, you'll see that the type parameter for Comparable is supposed to be the type of the implementing class: http://docs.oracle.com/javase/6/docs/api/java/lang/Comparable.html The current type signature of Comparable<Object> is pretty awful, at the very least because you can not, in fact, successfully compare AnyObjectId with any random subclass of Object. It also causes problems with type-inference and the scala.math.Ordering trait in Scala. In order to compile, this change *does* require removing the AnyObjectId.ompareTo(Object) method - which actually only ever cast to AnyObjectId in any case. Nothing in the JGit test suite requires this method, but it might constitute a breaking API change, so it would be best if it can be added in time for JGit 3.0. Change-Id: I3b549a5519ccd6785f98e444da76d2363bcbe41a
* Fix CommitCommand not to destroy repoChristian Halstrick2013-05-112-60/+98
| | | | | | | | | | | | | | | | | | There was a severe bug in CommitCommand which could corrupt repos. When merging an annotated tag the JGit MergeCommand writes correctly the ID of the tag (and not the id of the commit the tag was pointing to) into MERGE_HEAD. Native git does the same. But CommitCommand was reading this file and trusting blindly that it will contain only IDs of commits. Then the CommitCommand created a commit which has as parent a non-commit object (the tag object). That's so corrupt that even native git gives up when you call "git log" in such a repo. To reproduce that with EGit simply right-click on a tag in the Repository View and select Merge. The result was a corrupt repo! Bug: 336291 Change-Id: I24cd5de19ce6ca7b68b4052c9e73dcc6d207b57c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Fix the parameters to an exceptionRobin Rosenberg2013-05-101-20/+18
| | | | | | | A parenthesis was in the wrong place passing arguments to the wrong format call. Also fix formatting of enclosing switch statement. Change-Id: I4cb9642f08b58c39033c3a81dab4bd56bebf4fd2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Prepare post 3.0.0 M7 buildsMatthias Sohn2013-05-0846-58/+58
| | | | Change-Id: I062c44529c7ae2f960d3c64a0923a45d2dc8a863 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v3.0.0.201305080800-m7v3.0.0.201305080800-m7Matthias Sohn2013-05-0846-58/+58
| | | | | Change-Id: I377b174993862918a117f54e6cba4733dfc2307c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Add missing @since tagsMatthias Sohn2013-05-065-1/+12
| | | | | Change-Id: I9657125765716c874bb6ecf8844c34749cb3b069 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Move org.eclipse.jgit.pgm's resource bundle to internal packageMatthias Sohn2013-05-0650-35/+50
| | | | | | | | Translatable texts aren't API and shouldn't require maintenance of @since tags to prevent API warnings. Change-Id: I228ff37f17c0e792a6bc188c463a0d19138e88ac Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge "URIish: Allow multiple slashes in paths"Shawn Pearce2013-05-052-4/+21
|\
| * URIish: Allow multiple slashes in pathsRobin Stocker2013-04-272-4/+21
| | | | | | | | | | | | It's also allowed by C Git. Change-Id: Ie0a0d1f57d84e70fd5ef50b7844d22fea43d0e08
* | Remove unused repository field from RevWalkDave Borowitz2013-05-052-10/+2
| | | | | | | | | | | | | | | | The comment about legacy Tag and Object types no longer applies, though prior to Idb273d5a92849b42935ac14eed73b796b80aad50 the field was still being used by RewriteTreeFilter. Change-Id: I9ee5da8f8a3b61c9cf543817c03117ee0609dd8f
* | Merge "Require a DiffConfig when creating a FollowFilter"Shawn Pearce2013-05-056-28/+47
|\ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-02 19:47:43 +0000