motiejus
/
jgit
1
Fork 0
Code Releases Activity
2,884 Commits 2 Branches 0 Tags 45 MiB
Java 98.8%
HTML 0.6%
Starlark 0.5%
Shell 0.1%
Go to file
Robin Stocker 7dc8a4f089 Fix exception on conflicts with recursive merge 
When there are conflicts with a recursive merge, the conflicting paths
are stored in unmergedPaths (field in ResolveMerger). Later, when the
MergeResult is constructed in MergeCommand, getBaseCommit is called,
which computes the merge base a second time.

In case of RecursiveMerger, getBaseCommit merges the multiple merge
bases into one. It does this not by creating a new ResolveMerger but
instead calling mergeTrees. The problem with mergeTrees is that at the
end, it checks if unmergedPaths is non-empty and returns false in that
case.

Because unmergedPaths was already non-empty because of the real merge,
it thinks that there were conflicts when computing the merge base again,
when there really were none.

This can be fixed by storing the base commit when computing it and then
returning that instead of computing it a second time.

Note that another possible fix would be to just use a new ResolveMerger
for merging the merge bases instead. This would also remove the need to
remember the old value of dircache, inCore and workingTreeIterator (see
RecursiveMerger#getBaseCommit).

Bug: 419641
Change-Id: Ib2ebf4e177498c22a9098aa225e3cfcf16bbd958
Signed-off-by: Robin Stocker <robin@nibor.org>
 		2013-12-03 21:05:37 +01:00
org.eclipse.jgit Fix exception on conflicts with recursive merge 2013-12-03 21:05:37 +01:00
org.eclipse.jgit.ant Update to Ant 1.9.2 2013-11-12 18:09:35 -05:00
org.eclipse.jgit.ant.test Use absolute paths for file:// URIs in tests 2013-11-01 19:57:47 -07:00
org.eclipse.jgit.archive Add uses directives to ensure OSGi wires jgit bundles correctly 2013-11-12 23:11:16 +01:00
org.eclipse.jgit.console Add missing resources from source.. in build.properties 2013-10-30 17:42:38 +01:00
org.eclipse.jgit.http.server Add uses directives to ensure OSGi wires jgit bundles correctly 2013-11-12 23:11:16 +01:00
org.eclipse.jgit.http.test Use getPath() in FileResolverTest 2013-11-01 19:57:47 -07:00
org.eclipse.jgit.java7 Prepare 3.2.0-SNAPSHOT builds 2013-10-03 18:21:31 +02:00
org.eclipse.jgit.java7.test Remove hardcoded target/trash from test cases 2013-11-01 19:57:47 -07:00
org.eclipse.jgit.junit Move SampleDataRepositoryTestCase to org.eclipse.jgit.test 2013-11-24 05:27:14 -05:00
org.eclipse.jgit.junit.http Prepare 3.2.0-SNAPSHOT builds 2013-10-03 18:21:31 +02:00
org.eclipse.jgit.packaging Update Jetty to 7.6.14.v20131031 2013-11-18 17:57:30 +01:00
org.eclipse.jgit.pgm Manage CheckoutConflictException in pgm 2013-11-29 23:42:08 +01:00
org.eclipse.jgit.pgm.test Add pgm test for checkout of existing branch with checkout conflict 2013-12-02 22:55:55 +01:00
org.eclipse.jgit.test Fix exception on conflicts with recursive merge 2013-12-03 21:05:37 +01:00
org.eclipse.jgit.ui Prepare 3.2.0-SNAPSHOT builds 2013-10-03 18:21:31 +02:00
tools Scripts to publish jgit artifacts on Maven central 2013-10-17 23:15:46 +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 Update Jetty to 7.6.14.v20131031 2013-11-18 17:57:30 +01: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/