Go to file
Christian Halstrick 3c544647b7 Fix ResolveMerger not to add paths with FileMode 0
When ResolveMerger finds a path where it has to do a content merge it
will try the content merge and if that succeeds it'll add the newly
produced content to the index. For the FileMode of this new index entry
it blindly copies the FileMode it finds for that path in the common base
tree. If by chance the common base tree does not contain this path it'll
try to add FileMode 0 (MISSING) to the index.

One could argue that this can't happen: how can the ResolveMerger
successfully (with no conflicts) merge two contents if there is no
common base? This was due to another bug in ResolveMerger. It failed to
find out that for two files which differ only in the FileMode (e.g. 644
vs. 755) it should not try a content merge.

Change-Id: I7a00fe1a6c610679be475cab8a3f8aa4c08811a1
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
2011-12-11 01:05:13 +01:00
org.eclipse.jgit Fix ResolveMerger not to add paths with FileMode 0 2011-12-11 01:05:13 +01:00
org.eclipse.jgit.ant Prepare 1.2.0 builds 2011-09-15 22:51:46 +02:00
org.eclipse.jgit.ant.test Prepare 1.2.0 builds 2011-09-15 22:51:46 +02:00
org.eclipse.jgit.console Prepare 1.2.0 builds 2011-09-15 22:51:46 +02:00
org.eclipse.jgit.generated.storage.dht.proto Prepare 1.2.0 builds 2011-09-15 22:51:46 +02:00
org.eclipse.jgit.http.server Add utilities for smart HTTP error handling 2011-11-22 15:51:14 -08:00
org.eclipse.jgit.http.test Fix HTTP unit tests 2011-11-30 17:40:10 -08:00
org.eclipse.jgit.iplog Prepare 1.2.0 builds 2011-09-15 22:51:46 +02:00
org.eclipse.jgit.junit Add methods for configuring platform emulation 2011-12-07 23:58:17 +01:00
org.eclipse.jgit.junit.http Prepare 1.2.0 builds 2011-09-15 22:51:46 +02:00
org.eclipse.jgit.packaging Update maven plugin versions 2011-11-29 01:16:47 +01:00
org.eclipse.jgit.pgm Make use of the many date formatting options in the log command 2011-10-26 23:15:24 +02:00
org.eclipse.jgit.storage.dht Fire IndexChangedEvent on DirCache.commit() 2011-09-30 00:00:22 +02:00
org.eclipse.jgit.storage.dht.test Prepare 1.2.0 builds 2011-09-15 22:51:46 +02:00
org.eclipse.jgit.test Fix ResolveMerger not to add paths with FileMode 0 2011-12-11 01:05:13 +01:00
org.eclipse.jgit.ui Prepare 1.2.0 builds 2011-09-15 22:51:46 +02:00
tools Fix version.sh 2011-12-10 01:03:33 +01: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
LICENSE Clean up LICENSE file 2010-07-02 14:52:49 -07:00
README Initial JGit contribution to eclipse.org 2009-09-29 16:47:03 -07:00
SUBMITTING_PATCHES Correcting explanation of EDL 2009-10-28 14:12:07 +01:00
pom.xml Update maven plugin versions 2011-11-29 01:16:47 +01:00

README

            == Java GIT ==

This package is licensed under the BSD.

  org.eclipse.jgit/

    A pure Java library capable of being run standalone, with no
    additional support libraries.  Some JUnit tests are provided
    to exercise the library.  The library provides functions to
    read and write a GIT formatted repository.

    All portions of jgit are covered by the BSD.  Absolutely no GPL,
    LGPL or EPL contributions are accepted within this package.

  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 never performed. On Windows you should thereforc
  make sure your projects and workspaces are configured to save files
  with Unix (LF) line endings.

            == 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 a lot of missing features. You need the real Git for this.
For some operations it may just be the preferred solution also. There
are not just a command line, there is e.g. git-gui that makes committing
partial files simple.

- Merging. 

- Repacking.

- Generate a GIT format patch.

- Apply a GIT format patch.

- Documentation. :-)

- gitattributes support
  In particular CRLF conversion is not implemented. Files are treated
  as byte sequences.

- submodule support
  Submodules are not supported or even recognized.

            == Support                         ==

  Post question, comments or patches to the git@vger.kernel.org mailing list.


            == Contributing                    ==

  See SUBMITTING_PATCHES in this directory. However, feedback and bug reports
  are also contributions.


            == About GIT                       ==

More information about GIT, its repository format, and the canonical
C based implementation can be obtained from the GIT websites:

  http://git.or.cz/
  http://www.kernel.org/pub/software/scm/git/
  http://www.kernel.org/pub/software/scm/git/docs/