motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-4.8' into stable-4.9 

* stable-4.8:
  Fix NoSuchFileException during directory cleanup in RefDirectory
  Externalize warning message in RefDirectory.delete()
  Suppress warning for trying to delete non-empty directory

Change-Id: I5e6cc35f3673545e7ff857e6ed0bcd2c44e50316
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-09-12 15:55:07 +09:00
parent de0a687948 db756e9147
commit b81092cc99
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
View File

@ -684,6 +684,7 @@ truncatedHunkOldLinesMissing=Truncated hunk, at least {0} old lines is missing
tSizeMustBeGreaterOrEqual1=tSize must be >= 1 tSizeMustBeGreaterOrEqual1=tSize must be >= 1
unableToCheckConnectivity=Unable to check connectivity. unableToCheckConnectivity=Unable to check connectivity.
unableToCreateNewObject=Unable to create new object: {0} unableToCreateNewObject=Unable to create new object: {0}
unableToRemovePath=Unable to remove path ''{0}''
unableToStore=Unable to store {0}. unableToStore=Unable to store {0}.
unableToWrite=Unable to write {0} unableToWrite=Unable to write {0}
unauthorized=Unauthorized unauthorized=Unauthorized

1
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
View File

@ -743,6 +743,7 @@ public static JGitText get() {
/***/ public String tSizeMustBeGreaterOrEqual1; /***/ public String tSizeMustBeGreaterOrEqual1;
/***/ public String unableToCheckConnectivity; /***/ public String unableToCheckConnectivity;
/***/ public String unableToCreateNewObject; /***/ public String unableToCreateNewObject;
/***/ public String unableToRemovePath;
/***/ public String unableToStore; /***/ public String unableToStore;
/***/ public String unableToWrite; /***/ public String unableToWrite;
/***/ public String unauthorized; /***/ public String unauthorized;

5
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
View File

@ -1275,13 +1275,14 @@ private static void delete(final File file, final int depth, LockFile rLck)
File dir = file.getParentFile(); File dir = file.getParentFile();
for (int i = 0; i < depth; ++i) { for (int i = 0; i < depth; ++i) {
try { try {
Files.delete(dir.toPath()); Files.deleteIfExists(dir.toPath());
} catch (DirectoryNotEmptyException e) { } catch (DirectoryNotEmptyException e) {
// Don't log; normal case when there are other refs with the // Don't log; normal case when there are other refs with the
// same prefix // same prefix
break; break;
} catch (IOException e) { } catch (IOException e) {
LOG.warn("Unable to remove path {}", dir, e); LOG.warn(MessageFormat.format(JGitText.get().unableToRemovePath,
dir), e);
break; break;
} }
dir = dir.getParentFile(); dir = dir.getParentFile();