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:
-rw-r--r--internal/git/log/tags.go8
1 files changed, 5 insertions, 3 deletions
diff --git a/internal/git/log/tags.go b/internal/git/log/tags.go
index 0487d2f65..bbb0ae282 100644
--- a/internal/git/log/tags.go
+++ b/internal/git/log/tags.go
@@ -35,9 +35,6 @@ func GetAllTags(ctx context.Context, repo *gitalypb.Repository) ([]*gitalypb.Tag
if err != nil {
return tags, err
}
- if info.IsBlob() {
- continue
- }
tag, err := buildTag(oid, info.Type, line[1], c)
if err != nil {
return tags, err
@@ -98,6 +95,11 @@ func buildAnnotatedTag(b *catfile.Batch, oid string) (*gitalypb.Tag, error) {
}
headerSplit := strings.SplitN(line, " ", 2)
switch headerSplit[0] {
+ case "type":
+ // we only want to get the referenced target commit, and are ignoring any other objects
+ if headerSplit[1] != "commit" {
+ continue
+ }
case "object":
commit, err := GetCommitCatfile(b, headerSplit[1])
if err != nil {