Skip to content
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

Jump to bottom

Adjust object format interface #28469

Merged
merged 16 commits into from
Dec 17, 2023
Merged

Adjust object format interface #28469

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
605326f
Adjust object format interface
lunny Dec 14, 2023
3e3902a
Merge branch 'main' into lunny/adjust_object_format
lunny Dec 14, 2023
619483a
Use ObjectFormatName in repository struct
lunny Dec 14, 2023
c86001d
Merge branch 'main' into lunny/adjust_object_format
lunny Dec 14, 2023
20b098a
use const variable
lunny Dec 14, 2023
1294c37
Add validate for objectformat
lunny Dec 14, 2023
3db1869
merge the switch
lunny Dec 14, 2023
6042d1b
Follow wxiaoguang's suggestion
lunny Dec 14, 2023
bc54bec
More refactoring
lunny Dec 14, 2023
5a3c997
Merge branch 'main' into lunny/adjust_object_format
lunny Dec 14, 2023
7a5da47
optimaztion
lunny Dec 14, 2023
b98f37b
Follow wxiaoguang's suggestion
lunny Dec 14, 2023
a6433aa
Add comment
lunny Dec 14, 2023
47fedfa
Simple the code
lunny Dec 14, 2023
d044663
Remove the empty check on ObjectFormatFromName
lunny Dec 17, 2023
4895fc3
Merge branch 'main' into lunny/adjust_object_format
lunny Dec 17, 2023
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
8 changes: 8 additions & 0 deletions modules/git/object_format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@ var sha1Pattern = regexp.MustCompile(`^[0-9a-f]{4,40}$`)

const Sha1ObjectFormatName = "sha1"
lunny marked this conversation as resolved.
Show resolved Hide resolved

func IsValidObjectFormat(name string) bool {
switch name {
lunny marked this conversation as resolved.
Show resolved Hide resolved
case Sha1ObjectFormatName:
return true
}
return false
}

type ObjectFormat interface {
String() string

Expand Down
3 changes: 3 additions & 0 deletions modules/git/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ func InitRepository(ctx context.Context, repoPath string, bare bool, objectForma
if objectFormatName == "" {
objectFormatName = Sha1ObjectFormatName
}
if !IsValidObjectFormat(objectFormatName) {
return fmt.Errorf("invalid object format: %s", objectFormatName)
}
cmd.AddOptionValues("--object-format", objectFormatName)
}
if bare {
Expand Down
Loading