3 files changed, 20 insertions, 0 deletions
diff --git a/object/resolve/peel_to_blob_id.go b/object/resolve/peel_to_blob_id.go
index d0e28dd9..d06fd675 100644
--- a/object/resolve/peel_to_blob_id.go
+++ b/object/resolve/peel_to_blob_id.go
@@ -25,6 +25,13 @@ func (r *Resolver) PeelToBlobID(id objectid.ObjectID) (objectid.ObjectID, error)
 			}
 
 			id = tag.Object().Target
+		case objecttype.TypeInvalid,
+			objecttype.TypeCommit,
+			objecttype.TypeTree,
+			objecttype.TypeFuture,
+			objecttype.TypeOfsDelta,
+			objecttype.TypeRefDelta:
+			return objectid.ObjectID{}, fmt.Errorf("object/resolve: expected blob-ish object %s, got %v", id, ty)
 		default:
 			return objectid.ObjectID{}, fmt.Errorf("object/resolve: expected blob-ish object %s, got %v", id, ty)
 		}
diff --git a/object/resolve/peel_to_commit_id.go b/object/resolve/peel_to_commit_id.go
index 3ff98fba..330e2a86 100644
--- a/object/resolve/peel_to_commit_id.go
+++ b/object/resolve/peel_to_commit_id.go
@@ -25,6 +25,13 @@ func (r *Resolver) PeelToCommitID(id objectid.ObjectID) (objectid.ObjectID, erro
 			}
 
 			id = tag.Object().Target
+		case objecttype.TypeInvalid,
+			objecttype.TypeTree,
+			objecttype.TypeBlob,
+			objecttype.TypeFuture,
+			objecttype.TypeOfsDelta,
+			objecttype.TypeRefDelta:
+			return objectid.ObjectID{}, fmt.Errorf("object/resolve: expected commit-ish object %s, got %v", id, ty)
 		default:
 			return objectid.ObjectID{}, fmt.Errorf("object/resolve: expected commit-ish object %s, got %v", id, ty)
 		}
diff --git a/object/resolve/peel_to_tree_id.go b/object/resolve/peel_to_tree_id.go
index 27c15672..54891aa4 100644
--- a/object/resolve/peel_to_tree_id.go
+++ b/object/resolve/peel_to_tree_id.go
@@ -33,6 +33,12 @@ func (r *Resolver) PeelToTreeID(id objectid.ObjectID) (objectid.ObjectID, error)
 			}
 
 			id = tag.Object().Target
+		case objecttype.TypeInvalid,
+			objecttype.TypeBlob,
+			objecttype.TypeFuture,
+			objecttype.TypeOfsDelta,
+			objecttype.TypeRefDelta:
+			return objectid.ObjectID{}, fmt.Errorf("object/resolve: expected tree-ish object %s, got %v", id, ty)
 		default:
 			return objectid.ObjectID{}, fmt.Errorf("object/resolve: expected tree-ish object %s, got %v", id, ty)
 		}