diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2017-06-07 16:58:18 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-06-07 16:58:18 +0200 |
| commit | 94c06009aafc7a61ae8a55699851a3e3ed27c19c (patch) | |
| tree | 465491d0b9a7dcd468733d098dff2bfb86420dac /org.eclipse.jgit/resources | |
| parent | 5bfeec4fdbe72ec7f4dac252b98c8bad05898ef1 (diff) | |
| parent | 6b1e3c58b16651dc72ec79a614d507e014d18393 (diff) | |
| download | jgit-94c06009aafc7a61ae8a55699851a3e3ed27c19c.tar.gz jgit-94c06009aafc7a61ae8a55699851a3e3ed27c19c.zip | |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
Run auto GC in the background
Change-Id: I5e25765f65d833f13cbe99696ef33055d7f5c4cf
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 | 2 |
1 files changed, 2 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 225cb53718..627007dc04 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -299,6 +299,8 @@ flagNotFromThis={0} not from this. flagsAlreadyCreated={0} flags already created. funnyRefname=funny refname gcFailed=Garbage collection failed. +gcLogExists=A previous GC run reported an error: ''{0}''. Automatic gc will fail until ''{1}'' is removed. +gcTooManyUnpruned=Too many loose, unpruneable objects after garbage collection. Consider adjusting gc.auto or gc.pruneExpire. gitmodulesNotFound=.gitmodules not found in tree. headRequiredToStash=HEAD required to stash local changes hoursAgo={0} hours ago |