Git Mission to MarsNews from JGit and EGitMatthias Sohn (SAP)

Maximilian Kögel (EclipseSource)

EclipseCon NA 2015

JGit / EGit 3.3Mar 2014

JGit EGit

symlinks on Java 7

support Apache HttpClient

basic symlink support

squash commits in history

Symlinks on Java 7

$ cd b

$ ln -s ../a a

$ ls –l

-rw-r--r-- B.txt

lrwxr-xr-x a -> ../a

Squash commits in history view

JGit / EGit 3.4June 2014 (Luna)

JGit EGit

new layout of commit

graph

kerberos authentication

archive command

edit / reword commit in

history

init in non-empty

directory

warn on checkout if

launch is running

New layout of commit graph

JGit

gitk

ArchiveCommand:

Creating source archives

Multi revert

Modify history

Warn on checkout if launch is running

JGit / EGit 3.5Sept 2014

JGit EGit

support .netrc

rebase --preserve-merges

cherry-pick --no-commit

improved interactive rebase

new stash menu

stash viewer

improved push wizards

team menu on working set

repo menu on resource

new logo

Improved

interactive rebase

Stash support

Team menu on working set

Repository menu on resource

JGit / EGit 3.6

JGit EGit

new ignore implementation

improved submodule

support

aggressive gc

security fixes

symlink support

checkout ours/theirs

Dec 2014

New ignore implementation

Much faster

** pattern:

a/**/b matches "a/b", "a/x/b", "a/x/y/b“

! to negate rules defined earlier:

.a ignore .a files

!lib.a but do track lib.a

Improved submodule support

Submodules nested

under .git

Staging View for submodules

(in separate projects)

Checkout ours/theirs

Available on conflicting files

JGit / EGit 3.7

JGit EGit

basics for gitattributes

basics for hook support

logging via slf4j

auto-configure Gerrit

performance improvements

Feb 2015

Auto-configure code review

when cloning from Gerrit

in progress for 4.0

JGit EGit

hooks

git attributes

move to Java 7

Enable try-with-resource

(Autoclosable)

model merge

Oomph setup of dev

workspace

Working with Models in EGit

Eclipse Team

Eclipse Team

EGit Subversive Eclipse CVS

Eclipse Team Logical Model Support

Eclipse Team

EGit

Logical model

ext. point

Logical model

merger ext. point

Eclipse Team Logical Model Support

Eclipse Team

EGit

Logical model

ext. point

Logical model

merger ext. point

Provider

(EMF Compare)

Demohttp://collaborative-modeling.org

Questions ??

Fixing Git vulnerability

On case-sensitive filesystem prepare a commit containing:

.GiT/config

GIT~1/refs/heads/master

.g\u200cit/config

On checkout this could modify files under .git

on some platforms ☹

.Git matches .git on case-insensitive

filesystem

GIT~1 matches .git on Windows (short-name)

.g\u200cit matches .git on HFS+ (ignored unicode chars)

Fixed in 3.4.2, 3.5.3 and 3.6.0+