diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-27 08:22:51 +0100 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2018-07-27 08:22:51 +0100 |
| commit | e90a013e4572d4cee5794e29c65dfa1803de3346 (patch) | |
| tree | 77fbaa69cf9d6cb20ab14dcfbad4be4a414c16b4 /org.eclipse.jgit/resources/org | |
| parent | c296342333ab43596452ea040fb608f613a3e4b8 (diff) | |
| parent | 29118ed117097c63bbd769ec8c6eedf0bd2f7e26 (diff) | |
| download | jgit-e90a013e4572d4cee5794e29c65dfa1803de3346.tar.gz jgit-e90a013e4572d4cee5794e29c65dfa1803de3346.zip | |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
Prepare 4.7.3-SNAPSHOT builds
JGit v4.7.2.201807261330-r
Delete all loose refs empty directories
Use java.nio to delete path to get detailed errors
GC: Remove empty references folders
Do not ignore path deletion errors
Change-Id: Iadc8275fbaa3d6f7d08a96ab66d49f392f6aab78
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 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 a9153ca345..4d2e38e7e3 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -45,6 +45,7 @@ branchNameInvalid=Branch name {0} is not allowed buildingBitmaps=Building bitmaps cachedPacksPreventsIndexCreation=Using cached packs prevents index creation cachedPacksPreventsListingObjects=Using cached packs prevents listing objects +cannotAccessLastModifiedForSafeDeletion=Unable to access lastModifiedTime of file {0}, skip deletion since we cannot safely avoid race condition cannotBeCombined=Cannot be combined. cannotBeRecursiveWhenTreesAreIncluded=TreeWalk shouldn't be recursive when tree objects are included. cannotChangeActionOnComment=Cannot change action on comment line in git-rebase-todo file, old action: {0}, new action: {1}. |