Jump to: navigation, search

Difference between revisions of "JGit/New and Noteworthy/2.2"

(Recursive Merge Support)
(Bug Fixes)
 
(8 intermediate revisions by the same user not shown)
Line 1: Line 1:
'''THIS IS TENTATIVE! RELEASE DATE: 12/19/2012'''
+
= Library =
 +
== RevWalk support for shallow clones ==
 +
StartGenerator now processes .git/shallow to have the RevWalk stop for shallow commits ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394543 bug 394543])
  
= RevWalk support for shallow clones =
+
== Other enhancements ==
 +
* FileBaseConfig supports UTF-8 byte order marker
 +
* Large (>32kiB) /info/refs responses on HTTP are compressed
  
StartGenerator now processes .git/shallow to have the RevWalk stop for shallow commits (gerrit #8345)
+
= Porcelain Commands =
  
https://git.eclipse.org/r/#/c/8345/
+
=={{code|CheckoutCommand}}==
 +
* Supports checking out 'ours' and 'theirs' ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=390147 bug 390147])
  
 
 
= Porcelain Commands =
 
 
=={{code|GarbageCollectCommand}}==
 
=={{code|GarbageCollectCommand}}==
* add initial GarbageCollectCommand implementation
+
* New GarbageCollectCommand command
 
+
=={{code|PullCommand}}==
+
* support for pull with --rebase and --no-rebase
+
  
 
=={{code|MergeCommand}}==
 
=={{code|MergeCommand}}==
* support for --no-ff while merging ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394432 bug 394432])
+
* Support for --no-ff while merging ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394432 bug 394432])
  
=={{code|CheckoutCommand}}==
+
=={{code|PullCommand}}==
* supports checking out 'ours' and 'theirs' ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=390147 bug 390147])
+
* Support for pull with --rebase and --no-rebase
  
=={{code|MergeCommand}}==
+
=={{code|RebaseCommand}}==
* Add support for rebase interactive 'edit' command ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394577 bug 394577])
+
* Added support for rebase interactive 'edit' command ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394577 bug 394577])
* Add support for rebase interactive 'reword' command ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394575 bug 394575])
+
* Added support for rebase interactive 'reword' command ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394575 bug 394575])
  
 
=={{code|RmCommand}}==
 
=={{code|RmCommand}}==
Line 30: Line 29:
  
 
= Command Line =
 
= Command Line =
* Added git-reflog to the CLI ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394497 bug 394497])
+
* New archive command supporting tar and zip
* Add --squash option to org.eclipse.jgit.pgm.Merge
+
* New reflog command ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=394497 bug 394497])
* Have git-ls tree to accept path args like git-ls-tree
+
* New status command 'jgit status' ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=348318 bug 348318])
* Added new Status CLI command 'jgit status' ([https://bugs.eclipse.org/bugs/show_bug.cgi?id=348318 bug 348318])
+
* Merge command
 +
** Added --squash option
 +
** Added support for --no-ff
 +
* Have jgit ls-tree to accept path args like git-ls-tree
  
= Performance improvements =
+
= Build =
* TODO
+
* JGit build was updated to use Tycho 0.16
  
 
= Bug Fixes =
 
= Bug Fixes =
[https://bugs.eclipse.org/bugs/buglist.cgi?list_id=1764539;resolution=FIXED;resolution=DUPLICATE;classification=Technology;chfieldto=2012-12-19;query_format=advanced;chfield=bug_status;chfieldfrom=2012-09-26;bug_status=RESOLVED;bug_status=VERIFIED;bug_status=CLOSED;component=JGit;product=JGit 10 Bugs and 10 enhancement requests] were closed
+
[https://bugs.eclipse.org/bugs/buglist.cgi?list_id=1764539;resolution=FIXED;resolution=DUPLICATE;classification=Technology;chfieldto=2012-12-19;query_format=advanced;chfield=bug_status;chfieldfrom=2012-09-26;bug_status=RESOLVED;bug_status=VERIFIED;bug_status=CLOSED;component=JGit;product=JGit 10 Bugs and 12 enhancement requests] were closed
 +
 
 +
= Contributors =
 +
The following developers worked on this release of JGit:
 +
 
 +
Chris Aniszczyk, Christian Halstrick, Colby Ranger, Dani Megert, Dariusz Luksza, Dave Borowitz, Jonathan Nieder, Ketan Padegaonkar, Marc Strapetz, Markus Duft, Markus Keller, Matthias Sohn, Mikael Karlsson, Patrick Carlson, Robin Rosenberg, Robin Stocker, Sasa Zivkov, Shawn O. Pearce, Shawn Pearce, Tomasz Zarna, Tommi Siivola

Latest revision as of 08:47, 19 December 2012

Library

RevWalk support for shallow clones

StartGenerator now processes .git/shallow to have the RevWalk stop for shallow commits (bug 394543)

Other enhancements

  • FileBaseConfig supports UTF-8 byte order marker
  • Large (>32kiB) /info/refs responses on HTTP are compressed

Porcelain Commands

CheckoutCommand

  • Supports checking out 'ours' and 'theirs' (bug 390147)

GarbageCollectCommand

  • New GarbageCollectCommand command

MergeCommand

PullCommand

  • Support for pull with --rebase and --no-rebase

RebaseCommand

  • Added support for rebase interactive 'edit' command (bug 394577)
  • Added support for rebase interactive 'reword' command (bug 394575)

RmCommand

  • Support for --cached (setCached(true)), which only removes from index (bug 395599)

Command Line

  • New archive command supporting tar and zip
  • New reflog command (bug 394497)
  • New status command 'jgit status' (bug 348318)
  • Merge command
    • Added --squash option
    • Added support for --no-ff
  • Have jgit ls-tree to accept path args like git-ls-tree

Build

  • JGit build was updated to use Tycho 0.16

Bug Fixes

10 Bugs and 12 enhancement requests were closed

Contributors

The following developers worked on this release of JGit:

Chris Aniszczyk, Christian Halstrick, Colby Ranger, Dani Megert, Dariusz Luksza, Dave Borowitz, Jonathan Nieder, Ketan Padegaonkar, Marc Strapetz, Markus Duft, Markus Keller, Matthias Sohn, Mikael Karlsson, Patrick Carlson, Robin Rosenberg, Robin Stocker, Sasa Zivkov, Shawn O. Pearce, Shawn Pearce, Tomasz Zarna, Tommi Siivola