diff options
| author | Matthias Sohn | 2018-07-27 08:51:58 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2018-07-27 08:52:13 +0000 |
| commit | a0b818ce01e928b9b7ffb568a87e41a70504e244 (patch) | |
| tree | 4121056d46707ca92b9795ab47ef1b4806bdb527 /org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | |
| parent | b6a6ba10c7670dbece318811eb1c46aa07988006 (diff) | |
| parent | e90a013e4572d4cee5794e29c65dfa1803de3346 (diff) | |
| download | jgit-a0b818ce01e928b9b7ffb568a87e41a70504e244.tar.gz jgit-a0b818ce01e928b9b7ffb568a87e41a70504e244.tar.xz jgit-a0b818ce01e928b9b7ffb568a87e41a70504e244.zip | |
Merge branch 'stable-4.8' into stable-4.9
* stable-4.8:
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: I6ab2b951dd94a9fc1c4f5283847a3e2ec37d0895
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties')
| -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 8bae60b0e3..81edcfb543 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}. |