diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-11-27 00:40:00 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-11-27 00:40:26 +0100 |
| commit | 95846863cbb929d2433d7a38151c2c7aebedafb0 (patch) | |
| tree | 783bf1f58584275b983f80e59d65c0d4aa644d8e /org.eclipse.jgit/resources/org/eclipse | |
| parent | ffe4616b5fff3772a26b8d9c56e50402d9563eac (diff) | |
| parent | a74c0cd333c11658afac2fd931f02bf6e1909153 (diff) | |
| download | jgit-95846863cbb929d2433d7a38151c2c7aebedafb0.tar.gz jgit-95846863cbb929d2433d7a38151c2c7aebedafb0.zip | |
Merge branch 'stable-5.4' into stable-5.5
* stable-5.4:
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: Icc34f809a3bb019d8d640b9bdb71363e617942e2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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 52359d1f12..14ab51c2c1 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -214,6 +214,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. |