Merge branch 'master' into servlet-4

* master:
  MultiPackIndexWriter: Encode checksum in base64
  DfsMidxWriter: Use the input data instead of rereading the midx
  DfsMidxWriter: Add a param to toggle bitmap writing
  PullCommandTest: Remove unused variable
  Update URL used to download artifacts from repo.eclipse.org
  Fix path of jgit artifacts in local maven repository
  MultiPackIndexWriter: report also the checksum in the result
  RefAdvancerWalk: Move to revwalk package
  pgm.MultiPackIndex: Move writing code to MidxWriter
  Allow extending TernarySearchTree
  MultiPackIndexWriter: Report progress writing chunks
  PackIndexMerger: Add progress monitor to the building process
  Bump minimum dependency for Bouncy Castle to 1.83.0
  Update version of last JGit release to 7.6.0.202603022253-r
  DfsMidxWriter: Split writing midx and its bitmaps
  MultiPackIndexLoader: report what chunk is going over size
  Prepare 7.7.0-SNAPSHOT builds
  Prepare 7.6.1-SNAPSHOT builds
  DfsPackFileMidx: Pass the right pack when building single-pack midx
  JGit v7.6.0.202603022253-r
  Add AddCommand #addFilepatterns methods
  Bazel: Pin jcl-over-slf4j to SLF4J_VERSION
  Prepare 7.6.0-SNAPSHOT builds
  JGit v7.6.0.202602242313-rc1
  Support diff3 conflict style in merges
  RebaseCommand: Honor the commit message cleanup configuration
  Remove the option to create 'blank issues' in GitHub
  Refactor handlePackError method to improve readability
  PackIndexMerger: Accept a midx as input to build another midx
  DfsPackFileMidxNPacks: Use only the list of packs in midx order
  DfsMidxWriterTest: Rename to DfsMidxWriterBitmapsTest
  Update jetty to 12.1.6
  Update bytebuddy to 1.18.5
  Update commons-codec to 1.21.0
  Orbit: update org.objenesis to 3.5.0
  DfsMidxWriter: Pass the PackIndexMerger instead of a Map of sources
  MidxIterators join: compare shifted packId
  DfsPackFileMidx: Offer localIterator
  Prepare 7.6.0-SNAPSHOT builds
  JGit v7.6.0.202602181523-m3
  PackIndexMerger: replace constructor with Builder
  JGit v7.6.0.202602172005-m3
  MidxIterator: Add reset method
  PackIndexMerger: remove rawIterator() method
  PackIndexMerge: Use deduped iterators instead of deduping while
reading
  PackIndexMerger: use MidxIterators instead of its own
  MidxIterators: Helpers around the MidxIterator
  Do not log packfiles moved away or pruned
  RevWalk: abort computation of merged commits if the monitor is
canceled

Change-Id: Ib6b840ac1dcdba0fd6256543de6226700b58f6e5
tree: 141f246bff66cd0a7194f88a9030cefb9f2313fe
  1. .github/
  2. .mvn/
  3. .settings/
  4. Documentation/
  5. lib/
  6. org.eclipse.jgit/
  7. org.eclipse.jgit.ant/
  8. org.eclipse.jgit.ant.test/
  9. org.eclipse.jgit.archive/
  10. org.eclipse.jgit.benchmarks/
  11. org.eclipse.jgit.coverage/
  12. org.eclipse.jgit.gpg.bc/
  13. org.eclipse.jgit.gpg.bc.test/
  14. org.eclipse.jgit.http.apache/
  15. org.eclipse.jgit.http.server/
  16. org.eclipse.jgit.http.test/
  17. org.eclipse.jgit.junit/
  18. org.eclipse.jgit.junit.http/
  19. org.eclipse.jgit.junit.ssh/
  20. org.eclipse.jgit.lfs/
  21. org.eclipse.jgit.lfs.server/
  22. org.eclipse.jgit.lfs.server.test/
  23. org.eclipse.jgit.lfs.test/
  24. org.eclipse.jgit.packaging/
  25. org.eclipse.jgit.pgm/
  26. org.eclipse.jgit.pgm.test/
  27. org.eclipse.jgit.ssh.apache/
  28. org.eclipse.jgit.ssh.apache.agent/
  29. org.eclipse.jgit.ssh.apache.test/
  30. org.eclipse.jgit.ssh.jsch/
  31. org.eclipse.jgit.ssh.jsch.test/
  32. org.eclipse.jgit.test/
  33. org.eclipse.jgit.ui/
  34. tools/
  35. .bazelrc
  36. .bazelversion
  37. .gitattributes
  38. .gitignore
  39. .mailmap
  40. BUILD
  41. CODE_OF_CONDUCT.md
  42. CONTRIBUTING.md
  43. Jenkinsfile
  44. LICENSE
  45. MODULE.bazel
  46. MODULE.bazel.lock
  47. pom.xml
  48. README.md
  49. SECURITY.md
  50. WORKSPACE
README.md

Eclipse JGit

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

License

License
JGit is licensed under the Eclipse Distribution License 1.0 (BSD-3-Clause).

Latest Release

Maven Central javadoc Java

Support

Issues Discussions
Post questions, comments or discussions to the jgit-dev@eclipse.org mailing list. You need to be subscribed to post.

Contributing

Contributors Last commit Commit activity the past week, 4 weeks Commits since
See the JGit and EGit Contributor Guide.

Build

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.

Modules

  • 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

About Git

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