summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prepare post 3.6.0-m1 buildsMatthias Sohn2014-11-1255-59/+59
| | | | | Change-Id: Ie9927de64fa6b7d517f96b8cd12e57541f284ff2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* JGit v3.6.0.201411121045-m1v3.6.0.201411121045-m1Matthias Sohn2014-11-1255-59/+59
| | | | | Change-Id: I9d789113d88cbbbdbabb8919f80c805aa4ba86fe Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* Merge branch 'stable-3.5'Matthias Sohn2014-11-121-1/+1
|\ | | | | | | | | | | | | | | | | | | * stable-3.5: Prepare 3.5.3-SNAPSHOT builds JGit v3.5.2.201411120430-r Don't use SSL anymore to avoid POODLE attack Change-Id: Icc8404a94512aae36da83baafb8b10422b7bbf7b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 3.5.3-SNAPSHOT buildsMatthias Sohn2014-11-1255-264/+264
| | | | | | | | | | Change-Id: Ia37eb66a0deaf6e86a726b1b12eaea25416d4a36 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.5.2.201411120430-rv3.5.2.201411120430-rMatthias Sohn2014-11-1255-59/+59
| | | | | | | | | | Change-Id: I217d25ee712cbde52bc9319ef1dd15d2f571d37a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Don't use SSL anymore to avoid POODLE attackDani Megert2014-11-071-1/+1
| | | | | | | | | | | | | | | | | | For details about poodle see: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-3566 Bug 450170 Change-Id: Ib169e88d9d51f4d0e6caa3a498f48edc81e0991d Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Introduce config parameter core.trustfolderstatChristian Halstrick2014-11-122-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JGit's ObjectDirectory implements the optimization that it remembers the pack folders (.git/objects/pack) lastModified timestamp and doesn't check for new packfiles in this folder if the lastModified attribute has not changed. In environments using NFS this can cause trouble. If multiple JGit instances from multiple machines work on the same repository and one instance creates a new ref and a new packfile (e.g. by doing a fetch) then the other machines may detect the new ref but can't resolve the referenced object because it doesn't detect that pack folder has a new packfile. That's because NFS may cache file/folder metadata for quite a long time and the pack folders modification time is not updated although a new packfile is there and could be read. The new config parameter core.trustfolderstat controls this behaviour. The default is true and jgits behaviours is unchanged. But if this parameter is set to false then jgit doesn't trust the pack directories lastmodified anymore. Instead it will always iterate through the content of that folder to detect new packfiles. Change-Id: Ie3b4e92933286aa9916070a22422e629b3147f54 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Fix javadoc formatting in ConfigConstantsMatthias Sohn2014-11-121-23/+15
| | | | | | | | Change-Id: I6ae39b874a3c1fa9e1cda235ff137c9eb8dd359f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Expand wildcard imports to specfic classesShawn Pearce2014-11-1010-42/+56
| | | | | | | | | | | | | | | | | | JGit style is to import exactly the classes required, and never to use "import foo.*" as the foo package could add new classes in the future which are conflicting/confusing with the imports already used by a source file. Change-Id: I5693408c777e5843ec65fff1163d5d717849fa34
* | Fix possible NPE in IndexDiff when not all submodules are clonedChristian Halstrick2014-11-092-21/+29
| | | | | | | | | | | | | | | | | | The latest changes to IndexDiff just assumed that all configured submodules are allways cloned. If a configured submodule did not exist an exception was thrown. This is fixed by this commit. Bug: 450567 Change-Id: Iabe3b196d998c19483082e5720038ebddaeb1890
* | Add missing @since tagsChristian Halstrick2014-11-092-2/+9
| | | | | | | | Change-Id: Ia657e46b9abc8c8640f63f6ff579b2f8f2b01de4
* | 4.4 target platform should use Luna repositoryMatthias Sohn2014-11-091-1/+1
| | | | | | | | Change-Id: I54cdfb5699f87bf86b0434aff0b9618e57a80757 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Add target platform for Mars using Orbit S-build"Matthias Sohn2014-11-092-1/+82
|\ \
| * | Add target platform for Mars using Orbit S-buildMatthias Sohn2014-11-072-1/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updates: - jsch to 0.1.51 (CQ 8889) - ant to 1.9.4 (CQ 8890) CQ: 8889 CQ: 8890 Change-Id: I31f331ce797994d164661b421bfbab33c289deaf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge "Implement atomic refs update, if possible by database"Shawn Pearce2014-11-076-0/+45
|\ \ \ | |/ / |/| |
| * | Implement atomic refs update, if possible by databaseStefan Beller2014-11-076-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by the series[1], this implements the possibility to have atomic ref transactions. If the database supports atomic ref update capabilities, we'll advertise these. If the client wishes to use this feature, either all refs will be updated or none at all. [1] http://thread.gmane.org/gmane.comp.version-control.git/259019/focus=259024 Change-Id: I7b5d19c21f3b5557e41b9bcb5d359a65ff1a493d Signed-off-by: Stefan Beller <sbeller@google.com>
* | | Make sure checkout doesn't report conflicts on ignored pathsChristian Halstrick2014-11-062-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a situation where a certain path was ignored but a working tree file with this path existed jgit didn't allow to checkout a branch which didn't ignore this path but contained different content. JGit considered this to be a checkout conflict to prevent overwriting the file in the working tree and raised an error. This commit fixes this by ensuring that ignored dirty working tree files don't lead to a checkout conflict. Bug: 450169 Change-Id: I90288d314ffac73c24a9c70a5181f8243bd4679a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Do not swallow exception if IndexDiff hits invalid ignore paramMatthias Sohn2014-11-061-1/+3
| | | | | | | | | | | | Change-Id: I8a595e1f01a0731118d3c537be420222f7fec744 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Fix non-externalized string warnings in IndexDiffMatthias Sohn2014-11-061-2/+2
| | | | | | | | | | | | Change-Id: Ia803182114f0e8b418428e03601f9afc6542ed28 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Add new method IndexDiff#getPathsWithIndexModeAxel Richard2014-11-061-0/+32
|/ / | | | | | | | | | | | | | | | | | | | | Get the list of paths that have the given file mode. This helps EGit to efficiently determine which modified files are symlinks and should be shown with a symlink icon in the staging view. Bug: 429302 Change-Id: Id15f0c6f265667f5b8b57cc2d9f97de568371919 Signed-off-by: Axel Richard <axel.richard@obeo.fr> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | add missing @since tag in StatusCommandChristian Halstrick2014-11-041-0/+1
| | | | | | | | Change-Id: Ie8d9c3878116488b973dfc80c7c97f174e769d3f
* | Add missing @since tags in SubmoduleWalkMatthias Sohn2014-11-031-0/+4
| | | | | | | | Change-Id: Ica34e6709a34977422fd528cbd4df0044403e45d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Add missing @since tagsMatthias Sohn2014-11-032-1/+7
| | | | | | | | Change-Id: I27207bafe0ce31caab25ab9c0be1f22adf151783 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Enhance SubmoduleWalk with a fast check whether a repo containsChristian Halstrick2014-11-031-0/+22
| | | | | | | | | | | | submodules Change-Id: Id37efb4f4dd77f3b8eb5607d15d32adeda3992d4
* | RebaseCommand should ignore submodule modificationsChristian Halstrick2014-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before a rebase happens the RebaseCommand checks that the working tree is clean. We don't want to start a rebase on a dirty working tree. If the working tree is dirty a rebase should not be allowed. But RebaseCommand should ignore modifications done to submodules. E.g. if a submodules HEAD points to <x> but the root repository has in index that the submodule should point to <y> then this should not prohibit a rebase. Also native git allows a rebase in this case. Since jgit's StatusCommand has learned to ignore submodule changes this is now used by the RebaseCommand to determine the repository state correctly. Bug: 446922 Change-Id: I487bf7484dca3f5501e6e514584e2871524eea19
* | Support for Submodule configuration submodule.<name>.ignoreChristian Halstrick2014-11-035-12/+378
| | | | | | | | | | | | | | | | | | | | | | | | For each submodule native git allows to configure which modifications to submodules should be ignored by the status command. It is possible to ignore "none", "all", "dirty", "untracked" [1]. This configuration is now supported by IndexDiff. The StatusCommand offers the possibility to specify this mode. [1] http://git-scm.com/docs/gitmodules Change-Id: Ifd81d574a680f9b4152945ba70f8ec4af4f452c9
* | Reimplementation of ignore rule parserAndrey Loskutov2014-10-2718-16/+3205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current IgnoreRule/FileNameMatcher implementation scales not well with huge repositories - it is both slow and memory expensive while parsing glob expressions (bug 440732). Addtitionally, the "double star" pattern (/**/) is not understood by the old parser (bug 416348). The proposed implementation is a complete clean room rewrite of the gitignore parser, aiming to add missing double star pattern support and improve the performance and memory consumption. The glob expressions from .gitignore rules are converted to Java regular expressions (java.util.regex.Pattern). java.util.regex.Pattern code can evaluate expression from gitignore rules considerable faster (and with less memory consumption) as the old FileNameMatcher implementation. CQ: 8828 Bug: 416348 Bug: 440732 Change-Id: Ibefb930381f2f16eddb9947e592752f8ae2b76e1 Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Merge "Initialize 'pathLen' field also for empty directories"Robin Stocker2014-10-232-0/+39
|\ \
| * | Initialize 'pathLen' field also for empty directoriesAndrey Loskutov2014-10-232-0/+39
| | | | | | | | | | | | | | | Bug: 445363 Change-Id: Ia8428af84fb61ba0d572374a19e8e8c55b138a63 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
* | | Merge "Add retainOnReset(RevFlag) to RevWalk to simplify reset usage"Shawn Pearce2014-10-201-1/+48
|\ \ \
| * | | Add retainOnReset(RevFlag) to RevWalk to simplify reset usageShawn Pearce2014-10-191-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications sometimes use a RevFlag instead of a Set<RevObject> to track boolean state bits about objects being processed. However this requires careful use of the resetRetain() methods to avoid an accidental clearing of the RevFlag bits, effectively clearing the Set<RevObject> the application wanted to track. Simplify that use case by offering retainOnReset, a collection of flags that are never cleared by the RevWalk. Change-Id: I4c05b89b1398e4a4f371eac3a5d1d5edddec838f
* | | | BundleWriter: Support including HEAD in bundleRobin Stocker2014-10-192-11/+19
|/ / / | | | | | | | | | | | | | | | Bug: 446813 Change-Id: Ide64aec2a995dd7ff6c1325c3ada242a4eb4565e Signed-off-by: Robin Stocker <robin@nibor.org>
* | | Merge branch 'stable-3.5'Matthias Sohn2014-10-141-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | * stable-3.5: Prepare 3.5.2-SNAPSHOT builds JGit v3.5.1.201410131835-r Only hide gitdir if the repository isn't bare Change-Id: I171e5fb8718cb6829bb1357859c95b4a29910ac6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 3.5.2-SNAPSHOT buildsMatthias Sohn2014-10-1455-264/+264
| | | | | | | | | | Change-Id: Ib2ccdebe80bad0b09d2d31889a3ab89d77e341f6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.5.1.201410131835-rv3.5.1.201410131835-rMatthias Sohn2014-10-1455-59/+59
| | | | | | | | | | Change-Id: I37e049c8e81f963cfb7c17f1af91fd4245766aee Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Merge "Only hide gitdir if the repository isn't bare" into stable-3.5Christian Halstrick2014-10-131-1/+1
| |\
| | * Only hide gitdir if the repository isn't bareMatthias Sohn2014-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | This problem was raised on the jgit list https://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02675.html Change-Id: I8ce8a159120ce3747d31d6f012c6d2c0d0ce7917 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Fix ResetCommand to default to mixed resetMatthias Sohn2014-10-132-0/+18
| | | | | | | | | | | | | | | | | | | | | ResetCommand threw an NPE if neither mode nor path was defined. Instead it should default to a mixed reset like native git does. Change-Id: I455902394f9e7b0c7afae42381f34838f7f2a138 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Update URL of JGit Maven release repositoryMatthias Sohn2014-10-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This repository is required to allow clirr to compare the API of the checked out version against the API of the latest release of jgit. The old Maven repository on the download server was replaced by Nexus a long time back. Change-Id: I05125407fb72531c6831ec721064b0dad278bde5 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | Merge branch 'stable-3.5'Matthias Sohn2014-10-121-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/stable-3.5: When marking commits as uninteresting don't care if the tree exists Change-Id: I66559a72ed7284cb721cf929512af884c0db2d61 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | When marking commits as uninteresting don't care if the tree existsChristian Halstrick2014-10-101-1/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | When during an ObjectWalk commits are marked as uninteresting we should be tolerant against the situation that the commit exists in the repo but the referenced tree is not exisiting. Since commit c4797fe98655b3d52d0a90ba44fce6e053db3b8b we are throwing MissingObjectException in such a case. This semantic differs from native git behaviour and may cause push operations to fail while they would work in native git. See: http://dev.eclipse.org/mhonarc/lists/egit-dev/msg03585.html Bug: 445744 Change-Id: Ib7dec10fd2ef1adbb8adbabb9d3d5a64e554286a
* | Compare API changes against 3.5.0Matthias Sohn2014-10-121-1/+1
| | | | | | | | Change-Id: I10e51aea66f1446dd1d6d367ea113d824252d82b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | Enable maven site generation for jgitMatthias Sohn2014-10-121-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generating the site: $ mvn site:site Local staging of the site: $ mvn site:stage the site is staged under ./target/staging/ If you can connect to build.eclipse.org over ssh (ask webmaster if you are a committer and need ssh access) you can deploy a local build of the site: $ mvn site:deploy The site is deployed under http://download.eclipse.org/jgit/site/${project.version} To select the ssh key to use for deploying over ssh add the following section to your Maven settings.xml: <server> <id>jgit.website</id> <username>username</username> <privateKey>${user.home}/.ssh/id_rsa</privateKey> <filePermissions>664</filePermission> <directoryPermissions>775</directoryPermissions> <configuration></configuration> </server> To deploy the site from Hudson https://hudson.eclipse.org/egit/ enable the Maven profile "build-server". Change-Id: I7e64c8560ca75196d2232f111ffad953c14f013f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> (cherry picked from commit 6d00f0a09c67421d4ac9960c568f9c18ceb4a6a4)
* | Generate javadocs as part of Maven site project reportsMatthias Sohn2014-10-121-0/+11
| | | | | | | | | | | | | | | | see http://maven.apache.org/plugins/maven-javadoc-plugin/usage.html Change-Id: I6dc5dddea0adbb4abf5560d5d1c833408e944082 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> (cherry picked from commit a3d0b0d903452ed9ba9d7bb5ea58c275b318a66f)
* | [Java 8] Configure doclint to accept missing descriptionsMatthias Sohn2014-10-121-0/+17
| | | | | | | | | | | | | | | | | | We avoid trivial descriptions in JavaDoc. Hence configure doclint to not fail on missing descriptions. Change-Id: Iba3d5aec18cc7d7f43e53fa6789f0dede9996fb7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> (cherry picked from commit 54dc4b20b3e084c9c470c8211810dff008b6f0fc)
* | Revert "When marking commits as uninteresting don't care if the tree exists"Christian Halstrick2014-10-101-5/+1
| | | | | | | | This reverts commit 441fdb54ef05bbe58c61d562b331d606b0edd783.
* | When marking commits as uninteresting don't care if the tree existsChristian Halstrick2014-10-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When during an ObjectWalk commits are marked as uninteresting we should be tolerant against the situation that the commit exists in the repo but the referenced tree is not exisiting. Since commit c4797fe98655b3d52d0a90ba44fce6e053db3b8b we are throwing MissingObjectException in such a case. This semantic differs from native git behaviour and may cause push operations to fail while they would work in native git. See: http://dev.eclipse.org/mhonarc/lists/egit-dev/msg03585.html Bug: 445744 Change-Id: Ib7dec10fd2ef1adbb8adbabb9d3d5a64e554286a
* | Merge branch 'stable-3.5'Matthias Sohn2014-09-268-15/+192
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-3.5: Prepare 3.5.1-SNAPSHOT builds JGit v3.5.0.201409260305-r Fix PackWriterBitmapWalker handling non-existing uninteresting objects Enable maven site generation for jgit Generate javadocs as part of Maven site project reports Compare API changes with clirr against 3.4.1 [cli] Use chaining credentials provider to enable .netrc Add chaining credentials provider [Java 8] Configure doclint to accept missing descriptions Do not use .netrc implicitly if no CredentialsProvider was set Prepare post 3.5.0-rc1 builds JGit 3.5.0.201409071800-rc1 Fix the ls-remote command when there is no local repo Change-Id: Iaa4485cac6ff9c7917380e89e12e416e0f52a557 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * Prepare 3.5.1-SNAPSHOT buildsMatthias Sohn2014-09-2655-264/+264
| | | | | | | | | | Change-Id: Ibf89f996c9d9a7e431ee09261987bb76246de441 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * JGit v3.5.0.201409260305-rv3.5.0.201409260305-rMatthias Sohn2014-09-2655-59/+59
| | | | | | | | | | Change-Id: Ibf382bda3dcbb4b70829b1dd3a8abfd07bc4879e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 14:18:07 +0000