diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-11-26 15:37:19 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-11-26 15:37:19 +0100 |
| commit | 3f85d3b75c559bd44b333a2ae66ceb6b93022000 (patch) | |
| tree | c55f9cce3207e1fc421d18f7446f7923872dfb69 /org.eclipse.jgit/resources/org/eclipse | |
| parent | 003e4cfc237a2bcf9349665e3578bead06c120c3 (diff) | |
| parent | 65598b95161e3766c31bddeb45bc5d628b6d90fd (diff) | |
| download | jgit-3f85d3b75c559bd44b333a2ae66ceb6b93022000.tar.gz jgit-3f85d3b75c559bd44b333a2ae66ceb6b93022000.zip | |
Merge branch 'stable-5.2' into stable-5.3
* stable-5.2:
Prepare 5.1.15-SNAPSHOT builds
JGit v5.1.14.202011251942-r
GC#deleteOrphans: log warning for deleted orphaned files
GC#deleteOrphans: handle failure to list files in pack directory
Ensure that GC#deleteOrphans respects pack lock
Update API warning filters
Remove unused imports
Change-Id: Id9386846a202b5ae98dd602744963f8897ddaa8c
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse')
| -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 43946265ce..324302c14b 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -204,6 +204,7 @@ deepenNotWithDeepen=Cannot combine deepen with deepen-not deepenSinceWithDeepen=Cannot combine deepen with deepen-since deleteBranchUnexpectedResult=Delete branch returned unexpected result {0} deleteFileFailed=Could not delete file {0} +deletedOrphanInPackDir=Deleted orphaned file {} deleteRequiresZeroNewId=Delete requires new ID to be zero deleteTagUnexpectedResult=Delete tag returned unexpected result {0} deletingNotSupported=Deleting {0} not supported. |