Skip to content

Use refname:strip-2 instead of refname:short when syncing tags #28797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jan 16, 2024
Merged

Use refname:strip-2 instead of refname:short when syncing tags #28797

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ea96a96
Use refname:strip-2 instead of refname:short when syncing tags
lunny Jan 15, 2024
af8a7b2
Fix test
lunny Jan 15, 2024
17db838
Add comment for the change
lunny Jan 15, 2024
c3012aa
Merge branch 'main' into lunny/fix_tags_sync
lunny Jan 15, 2024
fcfe12c
move test to use refname:lstrip-2
lunny Jan 16, 2024
6b16e92
Merge branch 'main' into lunny/fix_tags_sync
lunny Jan 16, 2024
ef07007
Fix test
lunny Jan 16, 2024
f776472
Fix test
lunny Jan 16, 2024
6b115a4
Fix test
lunny Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions modules/git/repo_tag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ func (repo *Repository) GetTagWithID(idStr, name string) (*Tag, error) {

// GetTagInfos returns all tag infos of the repository.
func (repo *Repository) GetTagInfos(page, pageSize int) ([]*Tag, int, error) {
forEachRefFmt := foreachref.NewFormat("objecttype", "refname:short", "object", "objectname", "creator", "contents", "contents:signature")
// Generally, refname:short should be equal to refname:lstrip=2 except core.warnAmbiguousRefs is used to select the strict abbreviation mode.
// https://git-scm.com/docs/git-for-each-ref#Documentation/git-for-each-ref.txt-refname
forEachRefFmt := foreachref.NewFormat("objecttype", "refname:lstrip=2", "object", "objectname", "creator", "contents", "contents:signature")

stdoutReader, stdoutWriter := io.Pipe()
defer stdoutReader.Close()
Expand All @@ -139,7 +141,7 @@ func (repo *Repository) GetTagInfos(page, pageSize int) ([]*Tag, int, error) {
break
}

tag, err := parseTagRef(repo.objectFormat, ref)
tag, err := parseTagRef(repo.objectFormat, ref, "refname:lstrip=2")
if err != nil {
return nil, 0, fmt.Errorf("GetTagInfos: parse tag: %w", err)
}
Expand All @@ -159,10 +161,10 @@ func (repo *Repository) GetTagInfos(page, pageSize int) ([]*Tag, int, error) {
}

// parseTagRef parses a tag from a 'git for-each-ref'-produced reference.
func parseTagRef(objectFormat ObjectFormat, ref map[string]string) (tag *Tag, err error) {
func parseTagRef(objectFormat ObjectFormat, ref map[string]string, tagNameKey string) (tag *Tag, err error) {
tag = &Tag{
Type: ref["objecttype"],
Name: ref["refname:short"],
Name: ref[tagNameKey],
}

tag.ID, err = NewIDFromString(ref["objectname"])
Expand Down
2 changes: 1 addition & 1 deletion modules/git/repo_tag_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ Add changelog of v1.9.1 (#7859)
for _, test := range tests {
tc := test // don't close over loop variable
t.Run(tc.name, func(t *testing.T) {
got, err := parseTagRef(sha1, tc.givenRef)
got, err := parseTagRef(sha1, tc.givenRef, "refname:short")

if tc.wantErr {
require.Error(t, err)
Expand Down