Browse Source

Merge branch 'stable-4.9'

* stable-4.9:
  LfsStore: Make inner class AppServer static
  DirCacheCheckout#processEntry: Fix typo in javadoc

Change-Id: Id8e4a3c4dc741e6e0182522e72ecb4b34ae419eb
stable-4.10
David Pursehouse 7 years ago
parent
commit
34d56fd277
  1. 2
      org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/LfsStore.java
  2. 2
      org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java

2
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/LfsStore.java

@ -82,7 +82,7 @@ class LfsStore extends TextBuiltin {
/**
* Tiny web application server for testing
*/
class AppServer {
static class AppServer {
private final Server server;

2
org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java vendored

@ -443,7 +443,7 @@ public class DirCacheCheckout {
* working tree was modified; even if the checkout fails.
*
* @return <code>false</code> if this method could not delete all the files
* which should be deleted (e.g. because of of the files was
* which should be deleted (e.g. because one of the files was
* locked). In this case {@link #getToBeDeleted()} lists the files
* which should be tried to be deleted outside of this method.
* Although <code>false</code> is returned the checkout was

Loading…
Cancel
Save