diff options
| author | David Pursehouse | 2018-09-12 10:03:26 +0000 |
|---|---|---|
| committer | David Pursehouse | 2018-09-12 10:03:32 +0000 |
| commit | fc480b3efcb7264ffc331aaf0243404f6499d7f8 (patch) | |
| tree | 9e44eb21e5dc89486e58f4922afc21308516a38d | |
| parent | 8527e74ea0ed9413bf8d7fd2bb091b607d1e28b6 (diff) | |
| parent | 83c0369e29e4b4abc56010df34b5e2e29417ff9f (diff) | |
| download | jgit-fc480b3efcb7264ffc331aaf0243404f6499d7f8.tar.gz jgit-fc480b3efcb7264ffc331aaf0243404f6499d7f8.tar.xz jgit-fc480b3efcb7264ffc331aaf0243404f6499d7f8.zip | |
Merge branch 'stable-4.11' into stable-5.0
* stable-4.11:
Fix NoSuchFileException during directory cleanup in RefDirectory
Externalize warning message in RefDirectory.delete()
Suppress warning for trying to delete non-empty directory
Change-Id: Ic7eaa0b6a4e750bc7853eb549a9e126269ae22cf
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
3 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index eaaf7f01bb..c8b24f559f 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -705,6 +705,7 @@ truncatedHunkOldLinesMissing=Truncated hunk, at least {0} old lines is missing tSizeMustBeGreaterOrEqual1=tSize must be >= 1 unableToCheckConnectivity=Unable to check connectivity. unableToCreateNewObject=Unable to create new object: {0} +unableToRemovePath=Unable to remove path ''{0}'' unableToStore=Unable to store {0}. unableToWrite=Unable to write {0} unauthorized=Unauthorized diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 5776ef2112..94b4e03bc5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -766,6 +766,7 @@ public class JGitText extends TranslationBundle { /***/ public String tSizeMustBeGreaterOrEqual1; /***/ public String unableToCheckConnectivity; /***/ public String unableToCreateNewObject; + /***/ public String unableToRemovePath; /***/ public String unableToStore; /***/ public String unableToWrite; /***/ public String unauthorized; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 450f3939a5..6a18df86e2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -1293,7 +1293,8 @@ public class RefDirectory extends RefDatabase { // same prefix break; } catch (IOException e) { - LOG.warn("Unable to remove path {}", dir, e); + LOG.warn(MessageFormat.format(JGitText.get().unableToRemovePath, + dir), e); break; } dir = dir.getParentFile(); |