diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2010-09-03 11:09:45 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2010-09-03 11:09:52 -0700 |
| commit | 33837e44c3ba6417cfd0fa52103bd1687dfcdfd8 (patch) | |
| tree | 47dfb77c240065fcce3bd433b16494b8ab1aa801 /org.eclipse.jgit/resources | |
| parent | e29cd27961856376184edc74df700629003ad2f0 (diff) | |
| parent | 9239c1038562c9c16a49165e3293f8c895ef50c2 (diff) | |
| download | jgit-33837e44c3ba6417cfd0fa52103bd1687dfcdfd8.tar.gz jgit-33837e44c3ba6417cfd0fa52103bd1687dfcdfd8.zip | |
Merge branch 'unpack-error'
* unpack-error:
ReceivePack: Rethrow exceptions caught during indexing
Change-Id: I0d0239d69cb5cd1a622bdee879978f0299e0ca40
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties index 5bebd18b30..cd932c6d83 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties @@ -384,6 +384,7 @@ unknownObjectType=Unknown object type {0}. unknownRepositoryFormat2=Unknown repository format "{0}"; expected "0". unknownRepositoryFormat=Unknown repository format unknownZlibError=Unknown zlib error. +unpackException=Exception while parsing pack stream unmergedPath=Unmerged path: {0} unreadablePackIndex=Unreadable pack index: {0} unrecognizedRef=Unrecognized ref: {0} |