Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2014-12-23 12:48:43 +0000
committerMatthias Sohn2014-12-23 13:55:52 +0000
commit7bbe819ba9406f92fb53e59af684c6174df3898f (patch)
tree62792b7a9156927a8c5181e081af0881bdc66459 /org.eclipse.egit.doc/help/JGit
parenta9231b84e0220f0876b1446eb91be4430caac897 (diff)
downloadegit-7bbe819ba9406f92fb53e59af684c6174df3898f.tar.gz
egit-7bbe819ba9406f92fb53e59af684c6174df3898f.tar.xz
egit-7bbe819ba9406f92fb53e59af684c6174df3898f.zip
Update documentation for 3.6.0
Change-Id: I07b5c880db9b0a7a97857743696cebc283441943 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.doc/help/JGit')
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Bug-Fixes.html61
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/3.6.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/3.5.html)43
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/Bug-Fixes.html114
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/Contributors.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Contributors.html)39
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Updating-This-Document.html)8
-rw-r--r--org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html5
6 files changed, 153 insertions, 117 deletions
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Bug-Fixes.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Bug-Fixes.html
deleted file mode 100644
index f19b5dec8d..0000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Bug-Fixes.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 3.5 New and Noteworthy - Bug Fixes</title>
- <link type="text/css" rel="stylesheet" href="../../../book.css"/>
- </head>
- <body>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <th style="width: 100%" align="center" colspan="3">Bug Fixes</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left">
- <a href="3.5.html" title="JGit 3.5 New and Noteworthy">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Contributors.html" title="Contributors">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">JGit 3.5 New and Noteworthy</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Contributors</td>
- </tr>
- </table><hr/>
- <h1 id="Bug_Fixes">Bug Fixes</h1>
- <p>
- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?classification=Technology&amp;list_id=10006180&amp;order=Importance&amp;product=JGit&amp;query_format=advanced&amp;resolution=FIXED&amp;resolution=DUPLICATE&amp;target_milestone=3.5" target="egit_external">15 Bugs and 3 enhancement requests</a> were closed
- </p><hr/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left">
- <a href="3.5.html" title="JGit 3.5 New and Noteworthy">
- <img alt="Previous" border="0" src="../../../images/prev.gif"/>
- </a>
- </td>
- <td style="width: 60%" align="center">
- <a href="3.5.html" title="JGit 3.5 New and Noteworthy">
- <img alt="JGit 3.5 New and Noteworthy" border="0" src="../../../images/home.gif"/>
- </a>
- </td>
- <td style="width: 20%" align="right">
- <a href="Contributors.html" title="Contributors">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top">JGit 3.5 New and Noteworthy</td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Contributors</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/3.5.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/3.6.html
index f02475249e..57117c598e 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/3.5.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/3.6.html
@@ -2,13 +2,13 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 3.5 New and Noteworthy</title>
+ <title>JGit 3.6 New and Noteworthy</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
- <th style="width: 100%" align="center" colspan="3">JGit 3.5 New and Noteworthy</th>
+ <th style="width: 100%" align="center" colspan="3">JGit 3.6 New and Noteworthy</th>
</tr>
<tr>
<td style="width: 20%" align="left"></td>
@@ -28,36 +28,31 @@
<h1 id="JGit">JGit</h1>
<h2 id="Features">Features</h2>
<ul>
- <li>Added parser and credentials provider for .netrc files</li>
- <li>RebaseCommand support for option --preserve-merges</li>
- <li>CommitCommand support for committing merges during rebase</li>
- <li>Pull with rebase now supports option --preserve-merges</li>
- <li>CherryPickCommand support for option --no-commit</li>
- <li>Enhance BranchConfig API to expose branch.* options</li>
- <li>RepoCommand
- <ul>
- <li>Allow projects without path attribute in manifest</li>
- <li>Handle repo manifest file without default remote</li>
- <li>Support remote aliases in repo manifest</li>
- <li>Support non-default remotes in project tag</li>
- <li>Add support to &lt;include&gt; tag in repo manifest xml</li>
- </ul>
- </li>
+ <li>Ignore rule parser was reimplemented to support ** wildcard patterns, negation rules and improve performance</li>
+ <li>Add "aggressive" option to GC</li>
+ <li>GarbageCollectCommand now supports DfsRepository</li>
+ <li>Support for Submodule configuration submodule.&lt;name&gt;.ignore</li>
+ <li>Support for new submodule repository layout (.git/modules of the super project contains the submodule repositories)</li>
+ <li>InitCommand support for option "--separate-git-dir" to store .git meta data directory in a separate directory</li>
+ <li>CloneCommand support to store .git meta data directory in a separate directory</li>
+ <li>Permission bits for "executable" attribute are now set according to the umask on Posix/Java7</li>
+ <li>BundleWriter now supports including HEAD in bundle</li>
+ <li>New config parameter core.trustfolderstat</li>
</ul>
- <h2 id="Command_Line">Command Line</h2>
+ <h2 id="JGit_Command_Line">JGit Command Line</h2>
<ul>
- <li>Merge command support for option -m</li>
- <li>Use credentials from .netrc if available</li>
+ <li>Add option --bare to clone command</li>
+ <li>Add options --heads and --tags to ls-remote command</li>
</ul>
<h2 id="Performance_Improvements">Performance Improvements</h2>
<ul>
- <li>Process most in-core merges without local temp files</li>
- <li>Small performance optimization for ignore rules matcher</li>
+ <li>Reimplemented ignore rule parser to improve performance of ignore rule evaluation</li>
+ <li>Enhance SubmoduleWalk with a fast check whether a repo contains submodules</li>
</ul>
<h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2>
<ul>
- <li>Updated Maven plugins used in build to latest versions</li>
- <li>Enable NLS / TranslationBundle to be used in OSGi</li>
+ <li>The java7 feature is now included in org.eclipse.jgit.feature</li>
+ <li>Maven site generation for jgit</li>
</ul><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/Bug-Fixes.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/Bug-Fixes.html
new file mode 100644
index 0000000000..51db9994f4
--- /dev/null
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/Bug-Fixes.html
@@ -0,0 +1,114 @@
+<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title>JGit 3.6 New and Noteworthy - Bug Fixes</title>
+ <link type="text/css" rel="stylesheet" href="../../../book.css"/>
+ </head>
+ <body>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <th style="width: 100%" align="center" colspan="3">Bug Fixes</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="3.6.html" title="JGit 3.6 New and Noteworthy">
+ <img alt="Previous" border="0" src="../../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Contributors.html" title="Contributors">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">JGit 3.6 New and Noteworthy</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Contributors</td>
+ </tr>
+ </table><hr/>
+ <h1 id="Bug_Fixes">Bug Fixes</h1>
+ <p>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?classification=Technology&amp;list_id=10006180&amp;order=Importance&amp;product=JGit&amp;query_format=advanced&amp;resolution=FIXED&amp;resolution=DUPLICATE&amp;target_milestone=3.6" target="egit_external">11 Bugs and 0 enhancement requests</a> were closed
+ </p>
+ <h3 id="Fix_for_CVE-2014-9390">Fix for CVE-2014-9390</h3>
+ <p>The patches fixing
+ <a href="http://article.gmane.org/gmane.linux.kernel/1853266" target="egit_external">CVE-2014-9390</a> released in
+ <a href="https://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02789.html" target="egit_external">JGit 3.4.2 and 3.5.3</a> are also included in 3.6.0.
+ </p>
+ <p>As described in
+ <a href="https://developer.atlassian.com/blog/2014/12/securing-your-git-server/" target="egit_external">Securing your Git server</a> native git has been enhanced by configuration parameters allowing to configure a git server to check all objects it receives against problematic pathes. A server running e.g. on Linux can be configured to check also for pathes problematic on HFS+ or NTFS. This is also possible for JGit based Git servers. JGit understands the boolean config parameters
+ <b>receive.fsckobjects</b>,
+ <b>fsck.safeForWindows</b> and
+ <b>fsck.safeForMacOS</b>. They match native git's
+ <b>receive.fsckobjects</b>,
+ <b>core.protectNTFS</b>,
+ <b>core.protectHFS</b>.
+ </p>
+ <table border="1" cellpadding="3" cellspacing="0">
+ <tr>
+ <th>git-core</th>
+ <th>JGit </th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>
+ <b>receive.fsckobjects</b>
+ </td>
+ <td>
+ <b>receive.fsckobjects</b>
+ </td>
+ <td>enable checks when receiving objects</td>
+ </tr>
+ <tr>
+ <td>
+ <b>core.protectNTFS</b>
+ </td>
+ <td>
+ <b>fsck.safeForWindows</b>
+ </td>
+ <td>check pathes problematic on NTFS</td>
+ </tr>
+ <tr>
+ <td>
+ <b>core.protectHFS</b>
+ </td>
+ <td>
+ <b>fsck.safeForMacOS</b>
+ </td>
+ <td>check pathes problematic on HFS+</td>
+ </tr>
+ </table>
+ <p>Enabling
+ <b>receive.fsckObjects</b> makes JGit check the integrity of objects before a push is accepted, which is a pre-requisite for the other flags. The
+ <b>fsck.safeForMacOS</b> and
+ <b>fsck.safeForWindows</b> flags prevent the OS X and Windows vulnerabilities described above, respectively. Both default to true on their respective systems but will need to be enabled specifically on other platforms. Since clients could be using a different operating system to your server you should enable both on JGit based servers.
+ </p><hr/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left">
+ <a href="3.6.html" title="JGit 3.6 New and Noteworthy">
+ <img alt="Previous" border="0" src="../../../images/prev.gif"/>
+ </a>
+ </td>
+ <td style="width: 60%" align="center">
+ <a href="3.6.html" title="JGit 3.6 New and Noteworthy">
+ <img alt="JGit 3.6 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ </a>
+ </td>
+ <td style="width: 20%" align="right">
+ <a href="Contributors.html" title="Contributors">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top">JGit 3.6 New and Noteworthy</td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Contributors</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/Contributors.html
index 4a53e4842c..1f39749bfc 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Contributors.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/Contributors.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 3.5 New and Noteworthy - Contributors</title>
+ <title>JGit 3.6 New and Noteworthy - Contributors</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -30,28 +30,17 @@
</tr>
</table><hr/>
<h1 id="Contributors">Contributors</h1>
- <p>The following 22 developers worked on this release of JGit:</p>
- <p>Alexey Kuznetsov,
- Andrey Loskutov,
- Anton Bannykh,
- Axel Richard,
- Christian Halstrick,
- Dani Megert,
- Dave Borowitz,
- Hugo Arès,
- Kevin Sawicki,
- Konrad Kügler,
- Laurent Goubet,
- Maik Schreiber,
- Marc Strapetz,
- Matthias Sohn,
- Roberto Tyley,
- Robin Rosenberg,
- Robin Stocker,
- Rüdiger Herrmann,
- Saša Živkov,
- Shawn Pearce,
- Yi EungJun,
+ <p>The following 11 developers worked on this release of JGit:</p>
+ <p>Andrey Loskutov,
+ Axel Richard,
+ Christian Halstrick,
+ Dani Megert,
+ Marc Strapetz,
+ Matthias Sohn,
+ Michael Keppler,
+ Robin Stocker,
+ Shawn Pearce,
+ Stefan Beller,
Yuxuan 'fishy' Wang</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
@@ -61,8 +50,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="3.5.html" title="JGit 3.5 New and Noteworthy">
- <img alt="JGit 3.5 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="3.6.html" title="JGit 3.6 New and Noteworthy">
+ <img alt="JGit 3.6 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/Updating-This-Document.html
index 7e6f173454..d71eb217e5 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.5/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/3.6/Updating-This-Document.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <title>JGit 3.5 New and Noteworthy - Updating This Document</title>
+ <title>JGit 3.6 New and Noteworthy - Updating This Document</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -29,7 +29,7 @@
<p> This document is maintained in a collaborative wiki. If you wish to
update or modify this document please visit
- <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.5" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.5</a>
+ <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.6" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/3.6</a>
</p><hr/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
@@ -39,8 +39,8 @@
</a>
</td>
<td style="width: 60%" align="center">
- <a href="3.5.html" title="JGit 3.5 New and Noteworthy">
- <img alt="JGit 3.5 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="3.6.html" title="JGit 3.6 New and Noteworthy">
+ <img alt="JGit 3.6 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right"></td>
diff --git a/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html b/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html
index 011be6415a..89fa80a1ee 100644
--- a/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html
+++ b/org.eclipse.egit.doc/help/JGit/User_Guide/User-Guide.html
@@ -27,9 +27,8 @@
</table><hr/>
<h1 id="Getting_Started">Getting Started</h1>
<p>If you're new to Git or distributed version control systems generally, then you might want to read
- <a href="../../EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" title="EGit/Git For Eclipse Users">Git for Eclipse Users</a> first. If you need more details and background read the
- <a href="http://book.git-scm.com" target="egit_external">Git Community Book</a> or
- <a href="http://progit.org/book/" target="egit_external">Git Pro</a>.
+ <a href="../../EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" title="EGit/Git For Eclipse Users">Git for Eclipse Users</a> first. If you need more details and background read the book
+ <a href="http://book.git-scm.com" target="egit_external">Pro Git</a>.
</p>
<h2 id="Taking_JGit_for_a_Spin">Taking JGit for a Spin</h2>
<p>Although you are probably interested in JGit because you want to integrate it into an existing application or create a tool, JGit is more than simply a Java library for working with git repository. So before diving into the different aspects of the library let's take JGit for a spin.</p>

Back to the top