diff options
| author | Matthias Sohn | 2018-07-27 09:03:11 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2018-07-27 09:03:24 +0000 |
| commit | 8b97c266c375c261aeb5b0adee8e1050c5e727f7 (patch) | |
| tree | 1671b3e33eae7269456804162c49dd0614fed532 /org.eclipse.jgit/resources | |
| parent | a96d640365b654625b70be52454625be11da6bc3 (diff) | |
| parent | a0b818ce01e928b9b7ffb568a87e41a70504e244 (diff) | |
| download | jgit-8b97c266c375c261aeb5b0adee8e1050c5e727f7.tar.gz jgit-8b97c266c375c261aeb5b0adee8e1050c5e727f7.tar.xz jgit-8b97c266c375c261aeb5b0adee8e1050c5e727f7.zip | |
Merge branch 'stable-4.9' into stable-4.10
* stable-4.9:
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: Ie7029bc91621af32e7bfd2e0d76a424b991b1995
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources')
| -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 b29383e481..0342bad95a 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -47,6 +47,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}. |