aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2018-06-13 12:01:40 -0400
committerMatthias Sohn2018-06-13 12:01:40 -0400
commit0896d6d16b9a9ee436e931297f405df1a09fbca5 (patch)
treeceaca9b9574e6762454516303673198e1bb41deb
parent9df32ed5010bd1cb6851f9385e494b205046fbca (diff)
downloadegit-0896d6d16b9a9ee436e931297f405df1a09fbca5.tar.gz
egit-0896d6d16b9a9ee436e931297f405df1a09fbca5.tar.xz
egit-0896d6d16b9a9ee436e931297f405df1a09fbca5.zip
Update documentation for 5.0
Change-Id: I60c829a3fd31c4406c8228894556ead76651418a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.doc/build-help.xml4
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html12
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html4
-rw-r--r--org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html23
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/4.11.html114
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/5.0.html184
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Contributors.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/Contributors.html)22
-rw-r--r--org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/Updating-This-Document.html)8
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html26
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_automatically.pngbin0 -> 42109 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_globally.pngbin0 -> 41522 bytes
-rw-r--r--org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_locally.pngbin0 -> 18856 bytes
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/4.11.html129
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/5.0.html160
-rw-r--r--org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/Updating-This-Document.html (renamed from org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/Updating-This-Document.html)16
-rw-r--r--org.eclipse.egit.doc/help/toc.xml40
16 files changed, 452 insertions, 290 deletions
diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml
index 40137d543..282f380c6 100644
--- a/org.eclipse.egit.doc/build-help.xml
+++ b/org.eclipse.egit.doc/build-help.xml
@@ -44,8 +44,8 @@
>
<path name="EGit/User_Guide" title="EGit User Guide" />
<path name="JGit/User_Guide" title="JGit User Guide" />
- <path name="EGit/New_and_Noteworthy/4.11" title="EGit 4.11 New and Noteworthy" />
- <path name="JGit/New_and_Noteworthy/4.11" title="JGit 4.11 New and Noteworthy" />
+ <path name="EGit/New_and_Noteworthy/5.0" title="EGit 5.0 New and Noteworthy" />
+ <path name="JGit/New_and_Noteworthy/5.0" title="JGit 5.0 New and Noteworthy" />
<path name="EGit/Git_For_Eclipse_Users" title="Git for Eclipse Users" />
<path name="EGit/Contributor_Guide" title="EGit Contributor Guide" />
<stylesheet url="book.css" />
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html
index 3224d1291..6654f4370 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Bugs.html
@@ -60,6 +60,18 @@
<a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JGit&amp;rep_platform=All&amp;op_sys=All" target="egit_external">File a bug for JGit</a>
</li>
</ul>
+ <h4 id="File_a_bug_for_a_vulnerability">File a bug for a vulnerability</h4>
+ <p>If you discovered a vulnerability you want to report </p>
+ <ul>
+ <li>create a bug in Bugzilla here
+ <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JGit" target="egit_external">https://bugs.eclipse.org/bugs/enter_bug.cgi?product=JGit</a>
+ </li>
+ <li>click "Show Advanced Fields" </li>
+ <li>and check the option "Committer-only group for handling security advisories in a closed fashion."</li>
+ <li>describe the vulnerability</li>
+ </ul>
+ <p>this will ensure that the discussion on the vulnerability is kept private between the reporter and the committer group
+ until the project prepared a release fixing the vulnerability</p>
<h3 id="Bug_Reports_and_Links">Bug Reports and Links</h3>
<table border="1" cellpadding="3" cellspacing="0">
<tr>
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
index 59052f315..c5f9a14da 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
@@ -56,8 +56,8 @@
</ul>
<h2 id="JGit_2">JGit</h2>
<ul>
- <li>JGit can be built using Maven.</li>
- <li>use Java 8 to run the JGit Maven build</li>
+ <li>JGit can be built using Maven or Bazel</li>
+ <li>use Java 8 to run the JGit build</li>
<li>JGit packaging projects (Eclipse features and p2 repository) are built using Maven and Tycho.</li>
</ul>
<h2 id="EGit_2">EGit</h2>
diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
index 76259eede..353df56bc 100644
--- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
+++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Contributing-Patches.html
@@ -59,7 +59,7 @@
</ul>
<p>In addition ensure</p>
<ul>
- <li>that the contributed code is licensed under the project license (EPL for EGit and EDL for JGit). This is done by putting a
+ <li>that the contributed code is licensed under the project license (EPL 2.0 for EGit and EDL 1.0 for JGit). This is done by putting a
<a href="http://www.eclipse.org/legal/copyrightandlicensenotice.php" target="egit_external">copyright and license header</a> into every new java file. See other existing project source files for the correct content.
</li>
</ul>
@@ -298,6 +298,26 @@ git config remote.review.push HEAD:refs/for/master
<p>Another workaround is to use
<a href="http://stackoverflow.com/questions/10413922/convert-spaces-to-tabs-in-lines-i-changed-in-a-commit?answertab=active#tab-top" target="egit_external">this little script</a> from the command line to edit away trailing whitespace from changed lines.
</p>
+ <h3 id="Use_of_the_.22final.22_modifier">Use of the "final" modifier</h3>
+ <p>New code uses the "final" modifier in the following circumstances
+ <a href="https://gerrit-review.googlesource.com/c/gerrit/+/61701/" target="egit_external">https://gerrit-review.googlesource.com/c/gerrit/+/61701/</a>.
+ </p>
+ <p>Always:</p>
+ <ul>
+ <li>final fields: marking fields as final forces them to be initialized in the constructor or at declaration</li>
+ <li>final static fields: clearly communicates the intent</li>
+ <li>where necessary to use final variables in inner anonymous classes</li>
+ </ul>
+ <p>Optional:</p>
+ <ul>
+ <li>final classes: use when appropriate, e.g. API restriction</li>
+ <li>final methods: similar to final classes</li>
+ </ul>
+ <p>Never:</p>
+ <ul>
+ <li>local variables: it clutters the code, and makes the code less readable. When copying old code to new location, finals should be removed</li>
+ <li>method parameters: similar to local variables</li>
+ </ul>
<h2 id="Commit_message_guidelines">Commit message guidelines</h2>
<ul>
<li>The commit message header should fit on one line and should start with an uppercase letter. A blank line separates it from the body of the message.</li>
@@ -368,6 +388,7 @@ Copyright (C) YEAR Your Name &lt;you@example.org&gt;
<a href="#Manual_alpha_testing">Manual alpha testing</a> section for some advice about how to test you work yourself.
</p>
<ul>
+ <li>Add automated tests for enhancements and bug fixes to ensure functional correctness and avoid regressions</li>
<li>Run all existing tests. It does not take very long.</li>
<li>Pay attention to the Java and Eclipse SDK baselines. EGit requires only Java 8 and Eclipse 4.4. You cannot use API's that are newer.</li>
</ul>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/4.11.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/4.11.html
deleted file mode 100644
index 32f21dcb4..000000000
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/4.11.html
+++ /dev/null
@@ -1,114 +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>EGit 4.11 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">EGit 4.11 New and Noteworthy</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left"></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"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Contributors</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="EGit">EGit</h1>
- <h2 id="Usability">Usability</h2>
- <ul>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531328" target="egit_external">bug 531328</a>: Delete Repository dialog: use "Delete" instead of "OK" for button
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531431" target="egit_external">bug 531431</a>: Use "Close" instead of "Ok" on the confirmation button of FetchResultDialog
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531264" target="egit_external">bug 531264</a>: Discard Local Changes should use verbs if triggered from Staging View
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=530685" target="egit_external">bug 530685</a>: Include local branch name in branch proposals of push branch wizard
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=530685" target="egit_external">bug 530685</a>: Asynchronous content proposals for upstream refs in PushBranchPage
- </li>
- <li>Make the PushWizardDialog a NonBlockingWizardDialog</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=530757" target="egit_external">bug 530757</a>: Remove extra progress popup in PushBranchWizard
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=510945" target="egit_external">bug 510945</a>: Provide option to copy file names in staging view to clipboard
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=530625" target="egit_external">bug 530625</a>: Select "ssh" protocol also for git-style URLs without scheme
- </li>
- <li>Avoid internal job being displayed in progress view</li>
- </ul>
- <h2 id="Performance_Improvements">Performance Improvements</h2>
- <ul>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531948" target="egit_external">bug 531948</a>: Speed up getting the last commit that changed a file
- </li>
- </ul>
- <h2 id="Bug_Fixes">Bug Fixes</h2>
- <p>
- <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&amp;resolution=DUPLICATE&amp;classification=Technology&amp;list_id=10006180&amp;order=Importance&amp;product=EGit&amp;query_format=advanced&amp;target_milestone=4.11" target="egit_external"> 15 Bugs and 2 enhancement requests</a> were closed
- </p>
- <ul>
- <li>Fix CSS for dark theme [
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531527" target="egit_external">https://bugs.eclipse.org/bugs/show_bug.cgi?id=531527</a>)
- </li>
- <li>{{bug bug 531527)</li>
- <li>{{bug]: Prevent NPE in RefContentProposal.appendObjectSummary </li>
- <li>Prevent MissingObjectException being logged in ref content proposal</li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=503198" target="egit_external">bug 503198</a>: Fix focus handling in GitHistoryPage
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=530412" target="egit_external">bug 530412</a>: Fix wrongly used IExtension.getNamespaceIdentifier
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=521176" target="egit_external">bug 521176</a>: Fix non-modal PushResultDialog
- </li>
- <li>
- <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=529950" target="egit_external">bug 529950</a>: More appealing layout on git project property page
- </li>
- </ul>
- <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2>
- <ul>
- <li>Update orbit to S20180302171354 (photon) and R20180206163158 (oxygen)</li>
- <li>Update tycho to 1.1.0</li>
- <li>Upgrade gson to version 2.8.2 (used by JGit)</li>
- <li>Upgrade commons-compress to 1.15 (used by JGit)</li>
- <li>Add com.jcraft.jzlib 1.1.1 (CQ 15293, bug 529129)</li>
- <li>Update API baselines in Oomph setup</li>
- </ul><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left"></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"></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/EGit/New_and_Noteworthy/5.0/5.0.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/5.0.html
new file mode 100644
index 000000000..8b2bc27a9
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/5.0.html
@@ -0,0 +1,184 @@
+<?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>EGit 5.0 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">EGit 5.0 New and Noteworthy</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left"></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"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Contributors</td>
+ </tr>
+ </table><hr class="navigation-separator"/>
+ <h1 id="EGit">EGit</h1>
+ <h2 id="Features">Features</h2>
+ <ul>
+ <li>Built-in EGit integration for LFS
+ <ul>
+ <li>Register builtin LFS on startup. When EGit starts and the lfs bundle (org.eclipse.jgit.lfs) is available register the LFS implementation and check configuration.</li>
+ <li>Allow install (enablement) of LFS support in Preferences (global) and on the repository (local).</li>
+ <li>Apply smudge/clean filters where applicable and required.</li>
+ <li>LFS integration using built-in JGit lfs filters fully works when using Gerrit with lfs plugin using ssh protocol.</li>
+ <li>Authentication when transporting lfs objects over http still missing, this is tracked in JGit
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535814" target="egit_external">bug 535814</a>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=534604" target="egit_external">bug 534604</a> Enable resource selection for launch variables
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=533344" target="egit_external">bug 533344</a> Allow cherry-picking a Gerrit change
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531953" target="egit_external">bug 531953</a> Allow cherry-picking merge commits
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=529255" target="egit_external">bug 529255</a> Github API: Support diff/patch generation via the Github API
+ </li>
+ </ul>
+ <h2 id="Usability">Usability</h2>
+ <ul>
+ <li>Add tracing of low-level JSch log messages</li>
+ <li>Natural sort for refs in FetchResultTable</li>
+ <li>Allow shortcuts for Gitflow commands</li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=534404" target="egit_external">bug 534404</a> Suggest complete repository path in NewRepositoryWizard
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=529449" target="egit_external">bug 529449</a> Natural sort for tags in CreateTagDialog
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=478159" target="egit_external">bug 478159</a> Show affected projects when deleting repository
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=510132" target="egit_external">bug 510132</a> Add support for the "*" as wildcard character in the staging view filter
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=511628" target="egit_external">bug 511628</a> Select repositories via double-click in RepositorySearchDialog
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=533019" target="egit_external">bug 533019</a> Update staging view on repository config changes
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=532458" target="egit_external">bug 532458</a> Remove some margins in staging view
+ </li>
+ </ul>
+ <h2 id="Performance_Improvements">Performance Improvements</h2>
+ <ul>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535516" target="egit_external">bug 535516</a> Use hash lookup for TreeViewers
+ </li>
+ <li>Ignore IndexChangedEvent if it originates from the same JGit process</li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=500106" target="egit_external">bug 500106</a> Improve asynchronous Eclipse workspace refreshes done by EGit
+ </li>
+ <li>Speed up the RepositoriesViewContentProvider</li>
+ <li>Use PathFilterGroup instead of PathFilter if possible. TreeWalks looking for a single path can use PathFilterGroup instead of PathFilter. This should be a little bit faster.</li>
+ <li>In EGit use mmap to map git packfiles into memory. Avoids allocating JGit buffer cache on the Java heap.</li>
+ </ul>
+ <h2 id="Bug_Fixes">Bug Fixes</h2>
+ <p>
+ <a href="https://bugs.eclipse.org/bugs/buglist.cgi?resolution=FIXED&amp;resolution=DUPLICATE&amp;classification=Technology&amp;list_id=10006180&amp;order=Importance&amp;product=EGit&amp;query_format=advanced&amp;target_milestone=5.0" target="egit_external">21 Bugs and 8 enhancement requests</a> were closed
+ </p>
+ <ul>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=529141" target="egit_external">bug 529141</a> Fix AssumeUnchangedOperation not working on directory/project
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=525769" target="egit_external">bug 525769</a> Don't try to store incomplete credentials in secure store
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=470452" target="egit_external">bug 470452</a> Improve check for uncommitted changes before cherry-pick
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=520693" target="egit_external">bug 520693</a> Respect gitattributes in the compare editor
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=533230" target="egit_external">bug 533230</a> Fix Repositories view blocking Eclipse on startup
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=533198" target="egit_external">bug 533198</a> improve branch name validation performance which was bad for big repositories
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=533477" target="egit_external">bug 533477</a> Fix substring matches in filter in branch selection dialogs
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=358206" target="egit_external">bug 358206</a> Handle Gerrit Change-Ids for merge commits
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=533336" target="egit_external">bug 533336</a> Keep Gerrit Change-Id for conflicting cherry-pick
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=531171" target="egit_external">bug 531171</a> Remove problem characters from task related branch name suggestion
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=533019" target="egit_external">bug 533019</a> Fix invalid thread access in staging view when config changes
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=525769" target="egit_external">bug 525769</a> Don't try to store incomplete credentials in secure store
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=534440" target="egit_external">bug 534440</a> Github API: Fix Repository.getWatchers(); add Repository.getStars()
+ </li>
+ </ul>
+ <h2 id="Removal_of.C2.A0deprecated_methods">Removal of deprecated methods</h2>
+ <ul>
+ <li>Remove deprecated UIUtils#applyHyperlinkDetectorStyleRanges and #getHyperlinkDetectorStyleRanges.</li>
+ <li>Remove deprecated InitOperation constructor. Use InitOperation#InitOperation(Repository, InitParameters) instead.</li>
+ <li>Remove deprecated GitFlowOperation#fetch(IProgressMonitor). Use GitFlowOperation#fetch(IProgressMonitor, int) instead.</li>
+ <li>Remove deprecated FeatureTrackOperation constructor. Use FeatureTrackOperation#FeatureTrackOperation(GitFlowRepository, Ref, int) instead.</li>
+ <li>Remove deprecated GitSynchronizeData#getSrcRemoteName</li>
+ <li>Remove deprecated GitSynchronizeData#getSrcMerge</li>
+ <li>Remove deprecated RepositoryMapping#getSubmoduleRepository. Use #getMapping(IResource) and then #getRepository()} on the returned mapping instead; it will return a submodule repository if the resource is in one.</li>
+ <li>Remove deprecated RemoveFromIndexOperation(Repository, IResource[]). Use #RemoveFromIndexOperation(Collection) instead.</li>
+ <li>Remove deprecated IgnoreOperation#IgnoreOperation(IResource[]). Use #IgnoreOperation(Collection) instead.</li>
+ <li>Github API: Remove deprecated WatcherService. Use StargazerService instead.</li>
+ <li>Github API: Remove deprecated User#getGravatarId and #setGravatarId</li>
+ <li>Github API: Remove deprecated Repository#getMasterBranch and #setMasterBranch</li>
+ <li>Github API: Remove deprecated Gist#setUser and #getUser methods</li>
+ </ul>
+ <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2>
+ <ul>
+ <li>Update to latest Photon Orbit R20180606145124</li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=530393" target="egit_external">bug 530393</a> Update EGit license to EPL-2.0
+ </li>
+ <li>Update target platform to use Orbit R20180531190352</li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=532272" target="egit_external">bug 532272</a> Update API baseline in Oomph setup
+ </li>
+ </ul><hr class="navigation-separator"/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left"></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"></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/EGit/New_and_Noteworthy/4.11/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Contributors.html
index 6bef7ead1..699d46abf 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/Contributors.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/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>EGit 4.11 New and Noteworthy - Contributors</title>
+ <title>EGit 5.0 New and Noteworthy - Contributors</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -12,7 +12,7 @@
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="4.11.html" title="EGit 4.11 New and Noteworthy">
+ <a href="5.0.html" title="EGit 5.0 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -24,30 +24,28 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">EGit 4.11 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">EGit 5.0 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
</tr>
</table><hr class="navigation-separator"/>
<h1 id="Contributors">Contributors</h1>
- <p>The following 7 developers worked on this release:</p>
- <p>Andrey Loskutov,
- Fabian Pfaff,
- Jonas Hungershausen,
- Lars Vogel,
+ <p>The following 5 developers worked on this release:</p>
+ <p>Christian Barcenas,
+ Markus Duft,
Matthias Sohn,
Michael Keppler,
Thomas Wolf</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="4.11.html" title="EGit 4.11 New and Noteworthy">
+ <a href="5.0.html" title="EGit 5.0 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.11.html" title="EGit 4.11 New and Noteworthy">
- <img alt="EGit 4.11 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="5.0.html" title="EGit 5.0 New and Noteworthy">
+ <img alt="EGit 5.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right">
@@ -57,7 +55,7 @@
</td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">EGit 4.11 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">EGit 5.0 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top">Updating This Document</td>
</tr>
diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/Updating-This-Document.html
index e904259a9..b5d2cea12 100644
--- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/4.11/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/5.0/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>EGit 4.11 New and Noteworthy - Updating This Document</title>
+ <title>EGit 5.0 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/EGit/New_and_Noteworthy/4.11" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/4.11</a>
+ <a href="http://wiki.eclipse.org/EGit/New_and_Noteworthy/5.0" target="egit_external">http://wiki.eclipse.org/EGit/New_and_Noteworthy/5.0</a>
</p><hr class="navigation-separator"/>
<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="4.11.html" title="EGit 4.11 New and Noteworthy">
- <img alt="EGit 4.11 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="5.0.html" title="EGit 5.0 New and Noteworthy">
+ <img alt="EGit 5.0 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/EGit/User_Guide/Tasks.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
index 8bfbbdde6..c49bfc188 100644
--- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html
@@ -2697,7 +2697,31 @@ Sein oder nicht sein
<li>Path to the project to import (folder which contains <tt>.project</tt>), relative to the repository</li>
</ol>
<p>Each project has one entry. So for multiple projects in the same repository, create such an entry for each project with the same repository URL. The import is smart enough to only clone each repository once.</p>
- <p>If the repository contains a project at the root, use <tt>.</tt> as the project path.</p><hr class="navigation-separator"/>
+ <p>If the repository contains a project at the root, use <tt>.</tt> as the project path.</p>
+ <h2 id="GIT_LFS_Support">GIT LFS Support</h2>
+ <p>Partial support for GIT LFS is included in EGit when the optional JGit LFS support bundle "Java implementation of Git - optional LFS support" is installed. This support works best when using the SSH protocol with a capable LFS remote (i.e. GitHub or Gerrit with LFS plugin).</p>
+ <p>To enable usage of EGit's LFS support, either enable it globally (for the current user) by pressing the "Enable LFS support globally" button:</p>
+ <p>
+ <img border="0" src="images/EGit-5.0_LFS_enable_globally.png"/>
+ </p>
+ <p>... or configure Eclipse to automatically make sure the LFS support is enabled whenever Eclipse starts up. Check the "Automatically configure LFS..." checkbox:</p>
+ <p>
+ <img border="0" src="images/EGit-5.0_LFS_enable_automatically.png"/>
+ </p>
+ <p>... or - to enable builtin LFS support only for a single repository - right click a repository and select "Enable LFS locally"</p>
+ <p>
+ <img border="0" src="images/EGit-5.0_LFS_enable_locally.png"/>
+ </p>
+ <p>Note that if the JGit LFS support has not been installed some actions are disabled. If LFS support is already enabled in a more global scope the "Enable LFS locally" action is not displayed.</p>
+ <p>Once LFS support is enable directly or indirectly for a repository, you can work as usual with files, more specifically these use cases should work:</p>
+ <ol>
+ <li>Fetching LFS objects from a LFS Server (note that HTTP authentication is not implemented yet, so SSH works best, as this provides a mechanism to authenticate).</li>
+ <li>Pushing LFS objects to an LFS Server (same note about HTTP authentication applies).</li>
+ <li>Staging and committing files which are managed by LFS (through .gitattributes).</li>
+ <li>Checking out files managed by LFS</li>
+ <li>Viewing LFS managed file's content from the GIT history</li>
+ <li>Comparing actual file content for LFS managed files from the history</li>
+ </ol><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_automatically.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_automatically.png
new file mode 100644
index 000000000..c3d8cbaef
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_automatically.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_globally.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_globally.png
new file mode 100644
index 000000000..02c6c849f
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_globally.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_locally.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_locally.png
new file mode 100644
index 000000000..cb5efd6f6
--- /dev/null
+++ b/org.eclipse.egit.doc/help/EGit/User_Guide/images/EGit-5.0_LFS_enable_locally.png
Binary files differ
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/4.11.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/4.11.html
deleted file mode 100644
index 2efe2fa75..000000000
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/4.11.html
+++ /dev/null
@@ -1,129 +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 4.11 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 4.11 New and Noteworthy</th>
- </tr>
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Updating-This-Document.html" title="Updating This Document">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Updating This Document</td>
- </tr>
- </table><hr class="navigation-separator"/>
- <h1 id="JGit">JGit</h1>
- <h2 id="Features">Features</h2>
- <ul>
- <li>LFS: Enable LFS support for the CLI, better error handling</li>
- <li>LFS: support merge/rebase/cherry-pick/diff/compare with LFS files</li>
- <li>LFS: Dramatically improve checkout speed with SSH authentication</li>
- <li>LFS: pre-push upload support</li>
- <li>LFS: Add remote download to SmudgeFilter</li>
- <li>Add ObjectIdSerializer</li>
- <li>dfs: Try to avoid searching UNREACHABLE_GARBAGE during packing</li>
- <li>RepoCommand: generate relative submodule URLs from absolute URLs.</li>
- <li>RepoCommand: don't record new commit if tree did not change</li>
- <li>RepoCommand: persist unreadable submodules in .gitmodules</li>
- <li>Add negotiation statistics to PackStatistics</li>
- <li>Basic submodule merge handling (bug 494551)</li>
- <li>Add class to access WindowCache statistics</li>
- <li>Progress reporting for checkout</li>
- </ul>
- <h2 id="Performance_Improvements">Performance Improvements</h2>
- <ul>
- <li>Add a minimum negotiation feature for fetch. Limits how many "have" lines the client sends. This feature is gated behind a "fetch.useminimalnegotiation" configuration flag, which defaults to false.</li>
- <li>GC: Replace Files methods with File alternatives</li>
- </ul>
- <h2 id="Fixes">Fixes</h2>
- <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=4.11" target="egit_external"> 1 enhancement requests and 7 bugs</a> were closed
- </p>
- <ul>
- <li>Fix DiffFormatter for diffs against working tree with autocrlf=true (bug 530106)</li>
- <li>Fix processing of gitignore negations (bug 409664)</li>
- <li>PathMatcher: fix handling of **/</li>
- <li>Don't subclass ThreadLocal to avoid memory leak in NLS (bug 449321)</li>
- <li>Set context classloader to null in WorkQueue (bug 517107)</li>
- <li>Fix ssh host name handling for Jsch (bug 531118)</li>
- <li>Fix that Jsch overrides the port in the URI with the one in ~/.ssh/config</li>
- <li>InitCommand: Don't leave Repository open after Git is closed</li>
- <li>MergedReftable to skip shadowed refs in same reftable</li>
- <li>Fix CleanCommand not to throw FileNotFoundExceptions (bug 514434)</li>
- <li>GC: Remove empty references folders</li>
- <li>Close RevWalk in BranchTrackingStatus.of() (bug 530757)</li>
- <li>Fix index blob for merges with CRLF translations (bug 499615)</li>
- <li>Honor CRLF settings when writing merge results (bug 499615)</li>
- <li>Minor improvements in git config file inclusions</li>
- <li>Enforce DFS blockLimit is a multiple of blockSize</li>
- <li>Skip broken symbolic ref in DfsReftableDatabase</li>
- <li>Revert handling of ssh IdentityFile to pre-4.9 behavior (bug 529173)</li>
- <li>RefDirectory#hasLooseRef: Fix stream resource leak reported by error-prone</li>
- <li>Ensure DirectoryStream is closed promptly</li>
- <li>Fix file handle leak in FetchCommand#fetchSubmodules (bug 526494)</li>
- <li>Skip unborn branches in UploadPack</li>
- <li>TransportLocal should reuse FS from source repo</li>
- </ul>
- <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2>
- <ul>
- <li>Upgrade spotbugs-maven-plugin to 3.1.2</li>
- <li>Update orbit to S20180302171354 (photon) and R20180206163158 (oxygen)</li>
- <li>Update tycho to 1.1.0</li>
- <li>Bazel: Support building with Java 9</li>
- <li>Update tycho to 1.1.0</li>
- <li>Upgrade gson to version 2.8.2</li>
- <li>Upgrade commons-compress to 1.15</li>
- <li>Upgrade error_prone_core to 2.2.0</li>
- <li>Upgrade Spotbugs to 3.1.1</li>
- <li>Add com.jcraft.jzlib 1.1.1 (bug 529129)</li>
- </ul>
- <h2 id="Contributors">Contributors</h2>
- <p>The following 17 contributors worked on this release:</p>
- <p>Christian Halstrick,
- Dave Borowitz,
- David Ostrovsky,
- David Pursehouse,
- David Turner,
- Han-Wen Nienhuys,
- Hector Caballero,
- Marc Strapetz,
- Markus Duft,
- Matthias Sohn,
- Michael Keppler,
- Minh Thai,
- Shawn Pearce,
- Terry Parker,
- Thomas Wolf,
- Tim Hosey,
- Zhen Chen</p><hr class="navigation-separator"/>
- <table class="navigation" style="width: 100%;" border="0" summary="navigation">
- <tr>
- <td style="width: 20%" align="left"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right">
- <a href="Updating-This-Document.html" title="Updating This Document">
- <img alt="Next" border="0" src="../../../images/next.gif"/>
- </a>
- </td>
- </tr>
- <tr>
- <td style="width: 20%" align="left" valign="top"></td>
- <td style="width: 60%" align="center"></td>
- <td style="width: 20%" align="right" valign="top">Updating This Document</td>
- </tr>
- </table>
- </body>
-</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/5.0.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/5.0.html
new file mode 100644
index 000000000..0b6c43c14
--- /dev/null
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/5.0.html
@@ -0,0 +1,160 @@
+<?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 5.0 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 5.0 New and Noteworthy</th>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Updating-This-Document.html" title="Updating This Document">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Updating This Document</td>
+ </tr>
+ </table><hr class="navigation-separator"/>
+ <h1 id="JGit">JGit</h1>
+ <h2 id="Features">Features</h2>
+ <ul>
+ <li>Fetch: Basic support for protocol v2 of the fetch-pack/upload-pack protocol. This protocol is described in the Git project in
+ <a href="https://github.com/git/git/blob/master/Documentation/technical/protocol-v2.txt" target="egit_external">"Documentation/technical/protocol-v2.txt"</a>. Notes:
+ <ul>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=534847" target="egit_external">bug 534847</a> AdvertiseRefsHook is not executed for v2, to be replaced by an appropriate hook
+ </li>
+ <li>
+ <a href="https://git.eclipse.org/r/#/c/120007/" target="egit_external">change 120007</a> support for shallow fetch using protocol v2 is not complete
+ </li>
+ </ul>
+ </li>
+ <li>Add protocol v2 support in jgit daemon. With this patch, a server spawned by jgit daemon can be accessed using protocol v2 from a Git client that supports it (for example, "git" with the appropriate patches, to be released with git 2.18). This is only activated if the repository's config has "protocol.version" be 2.</li>
+ <li>Store in IndexChangedEvent if it was caused by JGit itself. This allows to differentiate if index was changed by an external git command or by JGit itself.</li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=358206" target="egit_external">bug 358206</a> Handle Gerrit Change-Ids for merge commits
+ </li>
+ <li>UploadPack: basic support for filtering by blob size. This is incomplete in that the filter-by-sparse-specification feature also supported by Git is not included yet.</li>
+ <li>Implement --force option in FetchCommand and CLI fetch command</li>
+ </ul>
+ <h2 id="Performance_Improvements">Performance Improvements</h2>
+ <ul>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=388582" target="egit_external">bug 388582</a> Skip ignored directories in FileTreeIterator
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=532300" target="egit_external">bug 532300</a> Significantly speed up FileTreeIterator on Windows
+ </li>
+ <li>Configure WindowCache settings to use in JGit CLI. Set the same defaults as in EGit. Use mmap to map git packfiles into memory. Avoids allocating JGit buffer cache on the Java heap.</li>
+ </ul>
+ <h2 id="Fixes">Fixes</h2>
+ <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=5.0" target="egit_external">0 enhancement requests and 6 bugs</a> were closed
+ </p>
+ <ul>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=423206" target="egit_external">bug 423206</a> Make JGit describe behaves same as c-git for lightweight tags
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535672" target="egit_external">bug 535672</a> Ensure Jsch checks all configured algorithms
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=535655" target="egit_external">bug 535655</a> Validate branch names on branch creation
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=533549" target="egit_external">bug 533549</a> Don't prune symbolic refs when fetch.prune = true
+ </li>
+ <li>Use a secure random generator to seed nonce for digest authentication</li>
+ <li>Retry stale NFS file handles on .git/config file (
+ <a href="https://git.eclipse.org/r/#/c/120973/" target="egit_external">https://git.eclipse.org/r/#/c/120973/</a>)
+ </li>
+ <li>
+ <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=529463" target="egit_external">bug 529463</a> ssh: Kill the external process when we're done instead of waiting forever
+ </li>
+ <li>Allow '@' as last character of ref. Previously @ was allowed e.g. in branch names, but not as the last character.</li>
+ <li>Don't throw an exception if a pre-push hook is ignored.</li>
+ <li>LFS: Fix potential NPE in LfsPrePushHook</li>
+ <li>FS#runProcess: Fix OutputStream left unclosed after IOException</li>
+ </ul>
+ <h2 id="Incompatible_Changes">Incompatible Changes</h2>
+ <ul>
+ <li>Remove deprecated Repository#notifyIndexChanged. Implementors should now override Repository#notifyIndexChanged(boolean)</li>
+ <li>Remove deprecated LfsProtocolServlet#getLargeFileRepository. Use LfsProtocolServlet##getLargeFileRepository(LfsRequest, String, String) instead.</li>
+ <li>Remove deprecated Lfs#Lfs(Path). Use Lfs#Lfs(Repository) instead.</li>
+ <li>Remove deprecated StreamCopyThread#flush</li>
+ <li>Remove deprecated SafeBufferedOutputStream. Use Java 8 BufferedOutputStream instead.</li>
+ <li>Remove deprecated EolCanonicalizingInputStream. Use AutoLFInputStream instead.</li>
+ <li>Remove deprecated FileUtils#relativize(String, String). Use the more-clearly-named FileUtils#relativizeNativePath(String, String) instead, or directly call FileUtils#relativizePath(String, String, String, boolean).</li>
+ <li>Remove deprecated FileUtil using Java 7 NIO</li>
+ <li>Remove deprecated TreeWalk#getEolStreamType. Use TreeWalk#getEolStreamType(OperationType) instead.</li>
+ <li>Remove deprecated FileTreeIterator(WorkingTreeIterator, File, FS). Use FileTreeIterator#FileTreeIterator(FileTreeIterator, File, FS) instead.</li>
+ <li>Remove deprecated TransportHttp#httpOpen(String, URL). Use TransportHttp#httpOpen(String, URL, AcceptEncoding) instead.</li>
+ <li>Remove deprecated ResolveMerger#processEntry method</li>
+ <li>Remove deprecated Repository#getRef. Use Repository#exactRef(String) or Repository#findRef(String) instead.</li>
+ <li>Remove deprecated BitmapBuilder#add. Use BitmapBuilder#or or BitmapBuilder#addObject instead.</li>
+ <li>Remove deprecated LockFile(File, FS) constructor. Use org.eclipse.jgit.internal.storage.file.LockFile#LockFile(File) instead.</li>
+ <li>Remove deprecated IgnoreNode#isIgnored method. Parameter negateFirstMatch is not honored anymore</li>
+ <li>Remove deprecated Statistics, UploadPackLogger, UploadPackLoggerChain. Use PackStatistics and PostUploadHook and PostUploadHookChain instead.</li>
+ <li>Remove UploadPack#getPackStatistics. Use #getStatistics instead</li>
+ <li>Remove UploadPack#getLogger and UploadPack#setLogger</li>
+ <li>Remove deprecated StoredObjectRepresentationnotAvailableException constructor. Use #StoredObjectRepresentationNotAvailableException(ObjectToPack, Throwable) instead.</li>
+ <li>Remove deprecated ArchiveCommand#putEntry method. Use #putEntry(Closeable, ObjectId, String, FileMode, ObjectLoader)} instead.</li>
+ <li>Fix misspelled class name: EmtpyCommitException -&gt; EmptyCommitException</li>
+ <li>RemoteAddCommand#setName(String) and #setUri(URIish): return RemoteAddCommand to allow chaining.</li>
+ </ul>
+ <h2 id="Build_and_Release_Engineering">Build and Release Engineering</h2>
+ <ul>
+ <li>Update to latest Photon Orbit R20180606145124</li>
+ <li>Update maven plugins to fix Zip Slip vulnerability</li>
+ <li>Bazel: Add a target to build jgit commandline tool</li>
+ <li>Use eclipse compiler in Maven build. Define profiles "ecj" for using Eclipse compiler and "javac" for using javac including errorprone. By default ecj will be used.</li>
+ <li>Upgrade error_prone_core to 2.3.1</li>
+ <li>Update SUA to current version.</li>
+ </ul>
+ <h2 id="Contributors">Contributors</h2>
+ <p>The following 17 contributors worked on this release:</p>
+ <p>Carsten Pfeiffer,
+ Christian Halstrick,
+ Dave Borowitz,
+ David Pursehouse,
+ David Turner,
+ Han-Wen Nienhuys,
+ Jonathan Nieder,
+ Jonathan Tan,
+ Marcel Trautwein,
+ Markus Duft,
+ Masaya Suzuki,
+ Matthias Sohn,
+ Michael Keppler,
+ Mincong HUANG,
+ Minh Thai,
+ Nasser Grainawi,
+ Thomas Wolf</p><hr class="navigation-separator"/>
+ <table class="navigation" style="width: 100%;" border="0" summary="navigation">
+ <tr>
+ <td style="width: 20%" align="left"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right">
+ <a href="Updating-This-Document.html" title="Updating This Document">
+ <img alt="Next" border="0" src="../../../images/next.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="width: 20%" align="left" valign="top"></td>
+ <td style="width: 60%" align="center"></td>
+ <td style="width: 20%" align="right" valign="top">Updating This Document</td>
+ </tr>
+ </table>
+ </body>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/Updating-This-Document.html
index 31758be6d..be622d5c5 100644
--- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/4.11/Updating-This-Document.html
+++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/5.0/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 4.11 New and Noteworthy - Updating This Document</title>
+ <title>JGit 5.0 New and Noteworthy - Updating This Document</title>
<link type="text/css" rel="stylesheet" href="../../../book.css"/>
</head>
<body>
@@ -12,7 +12,7 @@
</tr>
<tr>
<td style="width: 20%" align="left">
- <a href="4.11.html" title="JGit 4.11 New and Noteworthy">
+ <a href="5.0.html" title="JGit 5.0 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
@@ -20,7 +20,7 @@
<td style="width: 20%" align="right"></td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">JGit 4.11 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">JGit 5.0 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top"></td>
</tr>
@@ -29,24 +29,24 @@
<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/4.11" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/4.11</a>
+ <a href="http://wiki.eclipse.org/JGit/New_and_Noteworthy/5.0" target="egit_external">http://wiki.eclipse.org/JGit/New_and_Noteworthy/5.0</a>
</p><hr class="navigation-separator"/>
<table class="navigation" style="width: 100%;" border="0" summary="navigation">
<tr>
<td style="width: 20%" align="left">
- <a href="4.11.html" title="JGit 4.11 New and Noteworthy">
+ <a href="5.0.html" title="JGit 5.0 New and Noteworthy">
<img alt="Previous" border="0" src="../../../images/prev.gif"/>
</a>
</td>
<td style="width: 60%" align="center">
- <a href="4.11.html" title="JGit 4.11 New and Noteworthy">
- <img alt="JGit 4.11 New and Noteworthy" border="0" src="../../../images/home.gif"/>
+ <a href="5.0.html" title="JGit 5.0 New and Noteworthy">
+ <img alt="JGit 5.0 New and Noteworthy" border="0" src="../../../images/home.gif"/>
</a>
</td>
<td style="width: 20%" align="right"></td>
</tr>
<tr>
- <td style="width: 20%" align="left" valign="top">JGit 4.11 New and Noteworthy</td>
+ <td style="width: 20%" align="left" valign="top">JGit 5.0 New and Noteworthy</td>
<td style="width: 60%" align="center"></td>
<td style="width: 20%" align="right" valign="top"></td>
</tr>
diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml
index d81142b2b..d4cfd5ad4 100644
--- a/org.eclipse.egit.doc/help/toc.xml
+++ b/org.eclipse.egit.doc/help/toc.xml
@@ -313,6 +313,7 @@
<topic href="help/EGit/User_Guide/Tasks.html#Export" label="Export"></topic>
<topic href="help/EGit/User_Guide/Tasks.html#Format" label="Format"></topic>
</topic>
+ <topic href="help/EGit/User_Guide/Tasks.html#GIT_LFS_Support" label="GIT LFS Support"></topic>
</topic>
<topic href="help/EGit/User_Guide/Reference.html" label="Reference">
<topic href="help/EGit/User_Guide/Reference.html#Menus" label="Menus">
@@ -445,25 +446,28 @@
</topic>
<topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html" label="EGit 4.11 New and Noteworthy">
- <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html" label="EGit">
- <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html#Usability" label="Usability"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html#Performance_Improvements" label="Performance Improvements"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html#Bug_Fixes" label="Bug Fixes"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.11/4.11.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.0/5.0.html" label="EGit 5.0 New and Noteworthy">
+ <topic href="help/EGit/New_and_Noteworthy/5.0/5.0.html" label="EGit">
+ <topic href="help/EGit/New_and_Noteworthy/5.0/5.0.html#Features" label="Features"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.0/5.0.html#Usability" label="Usability"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.0/5.0.html#Performance_Improvements" label="Performance Improvements"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.0/5.0.html#Bug_Fixes" label="Bug Fixes"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.0/5.0.html#Removal_of.C2.A0deprecated_methods" label="Removal of deprecated methods"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.0/5.0.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic>
</topic>
- <topic href="help/EGit/New_and_Noteworthy/4.11/Contributors.html" label="Contributors"></topic>
- <topic href="help/EGit/New_and_Noteworthy/4.11/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.0/Contributors.html" label="Contributors"></topic>
+ <topic href="help/EGit/New_and_Noteworthy/5.0/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
- <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html" label="JGit 4.11 New and Noteworthy">
- <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html" label="JGit">
- <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html#Features" label="Features"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html#Performance_Improvements" label="Performance Improvements"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html#Fixes" label="Fixes"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic>
- <topic href="help/JGit/New_and_Noteworthy/4.11/4.11.html#Contributors" label="Contributors"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.0/5.0.html" label="JGit 5.0 New and Noteworthy">
+ <topic href="help/JGit/New_and_Noteworthy/5.0/5.0.html" label="JGit">
+ <topic href="help/JGit/New_and_Noteworthy/5.0/5.0.html#Features" label="Features"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.0/5.0.html#Performance_Improvements" label="Performance Improvements"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.0/5.0.html#Fixes" label="Fixes"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.0/5.0.html#Incompatible_Changes" label="Incompatible Changes"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.0/5.0.html#Build_and_Release_Engineering" label="Build and Release Engineering"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.0/5.0.html#Contributors" label="Contributors"></topic>
</topic>
- <topic href="help/JGit/New_and_Noteworthy/4.11/Updating-This-Document.html" label="Updating This Document"></topic>
+ <topic href="help/JGit/New_and_Noteworthy/5.0/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
<topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Git for Eclipse Users">
<topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Centralised version control systems"></topic>
@@ -530,6 +534,7 @@
<topic href="help/EGit/Contributor_Guide/Bugs.html#Filing_Bugs" label="Filing Bugs">
<topic href="help/EGit/Contributor_Guide/Bugs.html#How_to_file_bugs" label="How to file bugs"></topic>
<topic href="help/EGit/Contributor_Guide/Bugs.html#File_a_bug" label="File a bug"></topic>
+ <topic href="help/EGit/Contributor_Guide/Bugs.html#File_a_bug_for_a_vulnerability" label="File a bug for a vulnerability"></topic>
</topic>
<topic href="help/EGit/Contributor_Guide/Bugs.html#Bug_Reports_and_Links" label="Bug Reports and Links"></topic>
</topic>
@@ -560,6 +565,7 @@
<topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Coding_standards" label="Coding standards">
<topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Braces_for_one-line_statements" label="Braces for one-line statements"></topic>
<topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Removing_trailing_whitespace" label="Removing trailing whitespace"></topic>
+ <topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Use_of_the_.22final.22_modifier" label="Use of the &quot;final&quot; modifier"></topic>
</topic>
<topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Commit_message_guidelines" label="Commit message guidelines"></topic>
<topic href="help/EGit/Contributor_Guide/Contributing-Patches.html#Copyright" label="Copyright"></topic>
@@ -583,4 +589,4 @@
</topic>
<topic href="help/EGit/Contributor_Guide/Updating-This-Document.html" label="Updating This Document"></topic>
</topic>
-</toc>
+</toc> \ No newline at end of file