Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2019-05-20 14:17:41 +0300
committerJacob Vosmaer <jacob@gitlab.com>2019-06-28 16:13:16 +0300
commit204d0bd39c07a1e3803cb92fcb12bde8b436abaf (patch)
tree63cf9cb5f49b14593db5d9a3c0902bd2e05619ee
parentecf9fde36cc622b78cd531c11ee854e928d2df00 (diff)
Check for unlabeled objects
-rw-r--r--parse-bitmap.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/parse-bitmap.go b/parse-bitmap.go
index b7ec1111e..92f3a6c4c 100644
--- a/parse-bitmap.go
+++ b/parse-bitmap.go
@@ -79,7 +79,7 @@ func _main(packIdx string) error {
setFunc := func(i uint32) error {
obj := packObjects[i]
if obj.objectType != tUnknown {
- return fmt.Errorf("type already set for object %d", i)
+ return fmt.Errorf("type already set for object %v", obj)
}
obj.objectType = t
@@ -92,6 +92,12 @@ func _main(packIdx string) error {
}
}
+ for _, obj := range packObjects {
+ if obj.objectType == tUnknown {
+ return fmt.Errorf("object missing type label: %v", obj)
+ }
+ }
+
for i := uint32(0); i < nBitmapCommits; i++ {
const entryHeaderLen = 6
if _, err := r.Discard(entryHeaderLen); err != nil {