Merge branch 'odb'

Conflicts:
	lib/git/cmd.py

1 files changed, 15 insertions, 9 deletions

diff --git a/lib/git/errors.py b/lib/git/errors.py
index f66fb528..d8a35e02 100644
--- a/lib/git/errors.py
+++ b/lib/git/errors.py
@@ -8,19 +8,25 @@ Module containing all exceptions thrown througout the git package,
 """
 
 class InvalidGitRepositoryError(Exception):
-    """
-    Thrown if the given repository appears to have an invalid format. 
-    """
+    """ Thrown if the given repository appears to have an invalid format.  """
+
+class ODBError(Exception):
+	"""All errors thrown by the object database"""
+	
+class InvalidDBRoot(ODBError):
+	"""Thrown if an object database cannot be initialized at the given path"""
+	
+class BadObject(ODBError):
+	"""The object with the given SHA does not exist"""
+	
+class BadObjectType(ODBError):
+	"""The object had an unsupported type"""
 
 class NoSuchPathError(OSError):
-    """
-    Thrown if a path could not be access by the system.
-    """
+    """ Thrown if a path could not be access by the system. """
 
 class GitCommandError(Exception):
-    """
-    Thrown if execution of the git command fails with non-zero status code.
-    """
+    """ Thrown if execution of the git command fails with non-zero status code. """
     def __init__(self, command, status, stderr=None):
         self.stderr = stderr
         self.status = status