commit | 6658f367682932c0a77061a5aa37c06e480a0c62 | [log] [tgz] |
---|---|---|
author | Masaya Suzuki <masayasuzuki@google.com> | Tue Jul 24 11:53:39 2018 -0700 |
committer | Masaya Suzuki <masayasuzuki@google.com> | Fri Jul 27 15:07:30 2018 -0700 |
tree | db6ccece58376db10a986e987f99b06ac1dc6816 | |
parent | e0e52cb0110a908959f7df13c5e66bf911bad74f [diff] |
Use project names instead of paths for the submodule name Two submodules at the same path on different branches need not represent the same repository, and two submodules at different paths can represent the same one. The C Git implementation uses the submodule name to internally manage the submodule repositories under .git/modules. When a submodule represents different repositories in different branches, it makes a conflict inside .git/modules. The current RepoCommand implementation uses submodule paths as the submodule names. When the manifest file mounts different repositories to the same path in different branches, this makes a situation described above. To solve this issue, we can use the project name instead of the path as the submodule name. On the other hand, since repo v1.12.8~3^2 (repo: Support multiple branches for the same project., 2013-10-11), a manifest file can mount the same project to different paths. If we naively use the project name as the submodule name, it makes a conflict in .git/modules, too. This patch uses the project name as the submodule name basically, but when the same project is mounted to different paths, it uses the project name and path as the submodule name. Change-Id: I09dc7d62ba59016fe28852d3139a56ef7ef49b8f Signed-off-by: Masaya Suzuki <masayasuzuki@google.com> Reported-by: JP Sugarbroad <jpsugar@google.com>
An implementation of the Git version control system in pure Java.
This package is licensed under the EDL (Eclipse Distribution License).
JGit can be imported straight into Eclipse, built and tested from there, but the automated builds use Maven.
org.eclipse.jgit
A pure Java library capable of being run standalone, with no additional support libraries. It provides classes to read and write a Git repository and operate on a working directory.
All portions of JGit are covered by the EDL. Absolutely no GPL, LGPL or EPL contributions are accepted within this package.
org.eclipse.jgit.ant
Ant tasks based on JGit.
org.eclipse.jgit.archive
Support for exporting to various archive formats (zip etc).
org.eclipse.jgit.http.apache
Apache httpclient support
org.eclipse.jgit.http.server
Server for the smart and dumb Git HTTP protocol.
org.eclipse.jgit.pgm
Command-line interface Git commands implemented using JGit (“pgm” stands for program).
org.eclipse.jgit.packaging
Production of Eclipse features and p2 repository for JGit. See the JGit Wiki on why and how to use this module.
org.eclipse.jgit.junit
Helpers for unit testing
org.eclipse.jgit.test
Unit tests for org.eclipse.jgit
org.eclipse.jgit.ant.test
org.eclipse.jgit.pgm.test
org.eclipse.jgit.http.test
org.eclipse.jgit.junit.test
No further description needed
Native smbolic links are supported, provided the file system supports them. For Windows you must have Windows Vista/Windows 2008 or newer, use a non-administrator account and have the SeCreateSymbolicLinkPrivilege.
Only the timestamp of the index is used by jgit if the index is dirty.
JGit requires at least a Java 8 JDK.
CRLF conversion is performed depending on the core.autocrlf setting, however Git for Windows by default stores that setting during installation in the “system wide” configuration file. If Git is not installed, use the global or repository configuration for the core.autocrlf setting.
The system wide configuration file is located relative to where C Git is installed. Make sure Git can be found via the PATH environment variable. When installing Git for Windows check the “Run Git from the Windows Command Prompt” option. There are other options like Eclipse settings that can be used for pointing out where C Git is installed. Modifying PATH is the recommended option if C Git is installed.
We try to use the same notation of $HOME as C Git does. On Windows this is often not the same value as the user.home system property.
org.eclipse.jgit/
Read loose and packed commits, trees, blobs, including deltafied objects.
Read objects from shared repositories
Write loose commits, trees, blobs.
Write blobs from local files or Java InputStreams.
Read blobs as Java InputStreams.
Copy trees to local directory, or local directory to a tree.
Lazily loads objects as necessary.
Read and write .git/config files.
Create a new repository.
Read and write refs, including walking through symrefs.
Read, update and write the Git index.
Checkout in dirty working directory if trivial.
Walk the history from a given set of commits looking for commits introducing changes in files under a specified path.
Object transport Fetch via ssh, git, http, Amazon S3 and bundles. Push via ssh, git and Amazon S3. JGit does not yet deltify the pushed packs so they may be a lot larger than C Git packs.
Garbage collection
Merge
Rebase
And much more
org.eclipse.jgit.pgm/
org.eclipse.jgit.ant/
org.eclipse.jgit.archive/
org.eclipse.http.*/
There are some missing features:
Post question, comments or patches to the jgit-dev@eclipse.org mailing list. You need to be subscribed to post, see here:
https://dev.eclipse.org/mailman/listinfo/jgit-dev
See the EGit Contributor Guide:
http://wiki.eclipse.org/EGit/Contributor_Guide
More information about Git, its repository format, and the canonical C based implementation can be obtained from the Git website: