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>
This commit is contained in:
commit
fc480b3efc
|
@ -705,6 +705,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
|
||||||
|
|
|
@ -766,6 +766,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;
|
||||||
|
|
|
@ -1293,7 +1293,8 @@ private static void delete(File file, int depth, LockFile rLck)
|
||||||
// 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();
|
||||||
|
|
Loading…
Reference in New Issue