Go to file
Thomas Wolf e297f503a1 RebaseCommand: better commit message rewording
Respect git config commit.cleanup for rewording. Note that by default
this is CleanupMode.STRIP, whereas before this change, JGit would take
the reworded message verbatim.

Squashing was the only place in JGit where it automatically and
unconditionally removed comment lines from commit messages. In other
places it didn't do so, and client code needed to do so.

Unconditionally removing comments is problematic if the commit message
_should_ contain some line starting with a hash, which can easily occur
with the way Github, Gitlab, and other git web servers link to issues
or PRs: they all allow the short-hand "#<number>".

Introduce a new InteractiveHandler2 extension interface, which can
return the edited message _and_ a clean-up mode. This way, client code
can decide on its own how to clean the message, and if JGit shouldn't
do any further cleaning, it can return CleanupMode.VERBATIM. Or
CleanupMode.WHITESPACE. (In the case of SQUASH, it is then of course
the client's responsibility to remove the squash comment lines.)

If the old InteractiveHandler interface is used, CleanupMode.STRIP is
applied unconditionally for squashing, as before.

Bug: 578173
Change-Id: Ia0040c247884e684587dd45d6cb85f8b72a4b876
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2022-01-31 00:42:35 +01:00
.mvn Configure max heap size for Maven build 2016-12-09 11:02:10 +01:00
.settings Add resource preferences for top level jgit project 2019-12-16 11:20:12 +01:00
Documentation searchForReuse might impact performance in large repositories 2021-06-25 17:57:59 +02:00
lib Bazel: Format build files with buildifier 2022-01-20 00:54:01 -05:00
org.eclipse.jgit RebaseCommand: better commit message rewording 2022-01-31 00:42:35 +01:00
org.eclipse.jgit.ant Merge branch 'stable-6.0' 2022-01-05 17:22:50 +01:00
org.eclipse.jgit.ant.test Merge branch 'stable-5.7' into stable-5.8 2021-12-04 18:55:17 +01:00
org.eclipse.jgit.archive Prepare 6.1.0-SNAPSHOT builds 2021-11-24 19:42:27 +01:00
org.eclipse.jgit.benchmarks Merge branch 'stable-6.0' 2021-11-28 12:07:48 +01:00
org.eclipse.jgit.coverage Prepare 6.0.1-SNAPSHOT builds 2021-11-29 17:37:27 +01:00
org.eclipse.jgit.gpg.bc Prepare 6.1.0-SNAPSHOT builds 2021-11-24 19:42:27 +01:00
org.eclipse.jgit.gpg.bc.test Bazel: Format build files with buildifier 2022-01-20 00:54:01 -05:00
org.eclipse.jgit.http.apache Prepare 6.0.1-SNAPSHOT builds 2021-11-29 17:37:27 +01:00
org.eclipse.jgit.http.server Merge branch 'stable-6.0' 2021-12-04 21:21:52 +01:00
org.eclipse.jgit.http.test [test] Fix closing of test repositories 2022-01-30 17:16:02 -05:00
org.eclipse.jgit.junit [test] Fix closing of test repositories 2022-01-30 17:16:02 -05:00
org.eclipse.jgit.junit.http [test] Fix closing of test repositories 2022-01-30 17:16:02 -05:00
org.eclipse.jgit.junit.ssh Switch to Apache MINA sshd 2.8.0 2022-01-07 02:15:24 +01:00
org.eclipse.jgit.lfs LFS: Fix error occurring during delete branch 2022-01-27 20:55:58 +01:00
org.eclipse.jgit.lfs.server Merge branch 'stable-6.0' 2022-01-19 09:53:21 +01:00
org.eclipse.jgit.lfs.server.test LFS: Fix error occurring during delete branch 2022-01-27 20:55:58 +01:00
org.eclipse.jgit.lfs.test Prepare 6.1.0-SNAPSHOT builds 2021-11-24 19:42:27 +01:00
org.eclipse.jgit.packaging Update orbit to I20220111151929 2022-01-19 09:54:37 +01:00
org.eclipse.jgit.pgm [errorprone] Fix implicit use of platform default charset 2022-01-19 09:54:37 +01:00
org.eclipse.jgit.pgm.test [test] Fix closing of test repositories 2022-01-30 17:16:02 -05:00
org.eclipse.jgit.ssh.apache sshd: Add README.md for SSH agents 2022-01-30 17:13:47 +01:00
org.eclipse.jgit.ssh.apache.agent sshd: Add README.md for SSH agents 2022-01-30 17:13:47 +01:00
org.eclipse.jgit.ssh.apache.test Switch to Apache MINA sshd 2.8.0 2022-01-07 02:15:24 +01:00
org.eclipse.jgit.ssh.jsch Prepare 6.0.1-SNAPSHOT builds 2021-11-29 17:37:27 +01:00
org.eclipse.jgit.ssh.jsch.test Prepare 6.0.1-SNAPSHOT builds 2021-11-29 17:37:27 +01:00
org.eclipse.jgit.test CommitCommand: commit message cleanup 2022-01-31 00:42:35 +01:00
org.eclipse.jgit.ui Prepare 6.0.1-SNAPSHOT builds 2021-11-29 17:37:27 +01:00
tools Bazel: Add RBE support 2022-01-20 06:43:13 -04:00
.bazelrc Bazel: Include bazel resource configuration file for RBE build 2022-01-22 20:43:56 +01:00
.bazelversion Bazel: Switch to using toolchain resolution for java rules 2022-01-20 06:40:51 -04:00
.gitattributes Initial JGit contribution to eclipse.org 2009-09-29 16:47:03 -07:00
.gitignore .gitignore: remove editor- and OS-specific files 2019-04-01 13:38:00 -07:00
.mailmap Add myself to .mailmap 2022-01-06 09:05:38 +01:00
BUILD sshd: add support for ssh-agent 2021-11-03 23:46:54 +01:00
CODE_OF_CONDUCT.md Add Eclipse code of conduct and security policy 2021-06-15 13:44:58 +02:00
CONTRIBUTING.md CONTRIBUTING: add explicit link to ECA 2021-06-15 14:01:00 +02:00
DEPENDENCIES Update Orbit to S20210817231813 2021-08-23 11:53:15 +02:00
LICENSE Clean up LICENSE file 2010-07-02 14:52:49 -07:00
README.md Update README 2021-11-07 23:21:39 +01:00
SECURITY.md Add Eclipse code of conduct and security policy 2021-06-15 13:44:58 +02:00
WORKSPACE Bazel: Add RBE support 2022-01-20 06:43:13 -04:00
pom.xml Update orbit to I20220111151929 2022-01-19 09:54:37 +01:00

README.md

Java Git

An implementation of the Git version control system in pure Java.

This project is licensed under the EDL (Eclipse Distribution License).

JGit can be imported straight into Eclipse and built and tested from there. It can be built from the command line using Maven or Bazel. The CI builds use Maven and run on Jenkins.

  • 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.lfs

    Support for LFS (Large File Storage).

  • org.eclipse.jgit.lfs.server

    Basic LFS server support.

  • 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.pgm

    Command-line interface Git commands implemented using JGit ("pgm" stands for program).

  • org.eclipse.jgit.ssh.apache

    Client support for the SSH protocol based on Apache Mina sshd.

  • org.eclipse.jgit.ssh.apache.agent

    Optional support for SSH agents for org.eclipse.jgit.ssh.apache.

  • org.eclipse.jgit.ui

    Simple UI for displaying git log.

Tests

  • org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, org.eclipse.jgit.junit.ssh: Helpers for unit testing
  • org.eclipse.jgit.ant.test: Unit tests for org.eclipse.jgit.ant
  • org.eclipse.jgit.http.test: Unit tests for org.eclipse.jgit.http.server
  • org.eclipse.jgit.lfs.server.test: Unit tests for org.eclipse.jgit.lfs.server
  • org.eclipse.jgit.lfs.test: Unit tests for org.eclipse.jgit.lfs
  • org.eclipse.jgit.pgm.test: Unit tests for org.eclipse.jgit.pgm
  • org.eclipse.jgit.ssh.apache.test: Unit tests for org.eclipse.jgit.ssh.apache
  • org.eclipse.jgit.test: Unit tests for org.eclipse.jgit

Warnings/Caveats

  • Native symbolic links are supported, provided the file system supports them. For Windows you must 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 6.0 and newer requires at least Java 11. Older versions require at least Java 1.8.

  • 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.

Features

  • 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, http, 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

    • Assorted set of command line utilities. Mostly for ad-hoc testing of jgit log, glog, fetch etc.
  • org.eclipse.jgit.ant

    • Ant tasks
  • org.eclipse.jgit.archive

    • Support for Zip/Tar and other formats
  • org.eclipse.http

    • HTTP client and server support

Missing Features

There are some missing features:

  • signing push
  • shallow and partial cloning
  • support for remote helpers
  • support for credential helpers
  • support for multiple working trees (git-worktree)
  • using external diff tools
  • support for HTTPS client certificates
  • SHA-256 object IDs
  • git protocol V2 (client side): packfile-uris
  • multi-pack index
  • split index

Support

Post questions, comments or discussions to the jgit-dev@eclipse.org mailing list. You need to be subscribed to post. File bugs and enhancement requests in Bugzilla.

Contributing

See the EGit Contributor Guide.

About Git

More information about Git, its repository format, and the canonical C based implementation can be obtained from the Git website.