motiejus
/
jgit
1
Fork 0
Code Releases Activity
3,214 Commits 2 Branches 0 Tags 45 MiB
Java 98.8%
HTML 0.6%
Starlark 0.5%
Shell 0.1%
Go to file
Konrad Kügler e0fbae5dc3 Rebase: Add --preserve-merges support 
With --preserve-merges C Git re-does merges using the rewritten merge
parents, discarding the old merge commit. For the common use-case of
pull with rebase this is unfortunate, as it loses the merge conflict
resolution (and other fixes in the merge), which may have taken quite
some time to get right in the first place.

To overcome this we use a two-fold approach:
If any of the (non-first) merge parents of a merge were rewritten, we
also redo the merge, to include the (potential) new changes in those
commits.
If only the first parent was rewritten, i.e. we are merging a branch
that is otherwise unaffected by the rebase, we instead cherry-pick the
merge commit at hand. This is done with the --mainline 1 and --no-commit
options to apply the changes introduced by the merge. Then we set up an
appropriate MERGE_HEAD and commit the result, thus effectively forging a
merge.

Apart from the approach taken to rebase merge commits, this
implementation closely follows C Git. As a result, both Git
implementations can continue rebases of each other.

Preserving merges works for both interactive and non-interactive rebase,
but as in C Git it is easy do get undesired outcomes with interactive
rebase.

CommitCommand supports committing merges during rebase now.

Bug: 439421
Change-Id: I4cf69b9d4ec6109d130ab8e3f42fcbdac25a13b2
Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
 		2014-07-15 19:00:58 -04:00
org.eclipse.jgit Rebase: Add --preserve-merges support 2014-07-15 19:00:58 -04:00
org.eclipse.jgit.ant Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
org.eclipse.jgit.ant.test Add new default settings from Eclipse 4.4 2014-07-02 00:34:41 +02:00
org.eclipse.jgit.archive Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
org.eclipse.jgit.console Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
org.eclipse.jgit.http.apache Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
org.eclipse.jgit.http.server Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
org.eclipse.jgit.http.test Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
org.eclipse.jgit.java7 Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
org.eclipse.jgit.java7.test Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
org.eclipse.jgit.junit Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
org.eclipse.jgit.junit.http Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
org.eclipse.jgit.packaging Prepare 3.5.0-SNAPSHOT builds 2014-06-04 18:23:29 -04:00
org.eclipse.jgit.pgm Handle diff formatting when there is nothing to compare with 2014-07-06 18:45:48 +02:00
org.eclipse.jgit.pgm.test Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
org.eclipse.jgit.test Rebase: Add --preserve-merges support 2014-07-15 19:00:58 -04:00
org.eclipse.jgit.ui Don't warn for methods that can be static 2014-07-02 00:36:38 +02:00
tools Enable passing version number to maven central scripts 2014-06-06 15:41:22 +02:00
.eclipse_iplog Update Eclipse IP log for 1.0 2011-05-25 20:14:35 +02:00
.gitattributes Initial JGit contribution to eclipse.org 2009-09-29 16:47:03 -07:00
.gitignore Ignore /target 2012-03-05 21:11:57 -08:00
LICENSE Clean up LICENSE file 2010-07-02 14:52:49 -07:00
README.md Implement recursive merge strategy 2013-02-22 23:51:50 +01:00
SUBMITTING_PATCHES Correcting explanation of EDL 2009-10-28 14:12:07 +01:00
pom.xml Prepare 3.5.0-SNAPSHOT builds 2014-06-04 18:23:29 -04:00

README.md

Java Git

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

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

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

    Unit tests for org.eclipse.jgit and the same licensing rules.

Warnings/Caveats

  • Symbolic links are not supported because java does not support it. Such links could be damaged.

  • Only the timestamp of the index is used by jgit check if the index is dirty.

  • Don't try the library with a JDK other than 1.6 (Java 6) unless you are prepared to investigate problems yourself. JDK 1.5.0_11 and later Java 5 versions may work. Earlier versions do not. JDK 1.4 is not supported. Apple's Java 1.5.0_07 is reported to work acceptably. We have no information about other vendors. Please report your findings if you try.

  • 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 the jgit.gitprefix system propety or 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 same value as the user.home system property.

Package 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 and Amazon S3. JGit does not yet deltify the pushed packs so they may be a lot larger than C Git packs.

  • org.eclipse.jgit.pgm/

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

Missing Features

There are some missing features:

  • gitattributes support

Support

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

Contributing

See the EGit Contributor Guide:

http://wiki.eclipse.org/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:

http://git-scm.com/