diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-11-27 09:07:00 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-11-27 09:07:30 +0100 |
| commit | d1801402fee871610e983846225afd6339ce8ffd (patch) | |
| tree | c3a53026ec7121a10fb3f98f5b1fb71ee71203b3 /org.eclipse.jgit/resources/org | |
| parent | 9f3616dcb43246b883f9943af0de7cf67836c443 (diff) | |
| parent | 0248c58b489bc7d8a769ca1da9bb8e172ecd5dbd (diff) | |
| download | jgit-d1801402fee871610e983846225afd6339ce8ffd.tar.gz jgit-d1801402fee871610e983846225afd6339ce8ffd.zip | |
Merge branch 'stable-5.7' into stable-5.8
* stable-5.7:
Remove unused imports
Silence API warnings
Remove erraneously merged source features
Prepare 5.3.9-SNAPSHOT builds
JGit v5.3.8.202011260953-r
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: I9b94938f5c09bd726e8e368c98c56da8280fd0b2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.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 e6da551bb7..bf19fd9ba0 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -215,6 +215,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. |