diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-11-26 15:34:08 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-11-26 15:34:24 +0100 |
| commit | 65598b95161e3766c31bddeb45bc5d628b6d90fd (patch) | |
| tree | 8c684c72691d446b277944d5b665623cd321c612 /org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java | |
| parent | 7c932a557ec0385e691e82a7bd6b2442d0ea5e16 (diff) | |
| parent | 8c2dc8b6c0ae6d5993ec57dac8859f3a42f795be (diff) | |
| download | jgit-65598b95161e3766c31bddeb45bc5d628b6d90fd.tar.gz jgit-65598b95161e3766c31bddeb45bc5d628b6d90fd.zip | |
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
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: I91cfe2820c40d2d773cbf018cc2a6c36b062801e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index f65e3746e1..db3caec5cd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -264,6 +264,7 @@ public class JGitText extends TranslationBundle { /***/ public String deepenSinceWithDeepen; /***/ public String deleteBranchUnexpectedResult; /***/ public String deleteFileFailed; + /***/ public String deletedOrphanInPackDir; /***/ public String deleteRequiresZeroNewId; /***/ public String deleteTagUnexpectedResult; /***/ public String deletingNotSupported; |