diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-12-19 15:20:47 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-19 07:20:47 +0000 |
| commit | 4eb2a29910779ac6005a5d67f31067a1132c5297 (patch) | |
| tree | 6be901075430e94785bc37ac4ec67392a17ed868 /cmd/hook.go | |
| parent | 128eac9e0b03ee9c1e45dbd49da8e4726ca569f2 (diff) | |
| download | gitea-4eb2a29910779ac6005a5d67f31067a1132c5297.tar.gz gitea-4eb2a29910779ac6005a5d67f31067a1132c5297.zip | |
Improve ObjectFormat interface (#28496)
The 4 functions are duplicated, especially as interface methods. I think
we just need to keep `MustID` the only one and remove other 3.
```
MustID(b []byte) ObjectID
MustIDFromString(s string) ObjectID
NewID(b []byte) (ObjectID, error)
NewIDFromString(s string) (ObjectID, error)
```
Introduced the new interfrace method `ComputeHash` which will replace
the interface `HasherInterface`. Now we don't need to keep two
interfaces.
Reintroduced `git.NewIDFromString` and `git.MustIDFromString`. The new
function will detect the hash length to decide which objectformat of it.
If it's 40, then it's SHA1. If it's 64, then it's SHA256. This will be
right if the commitID is a full one. So the parameter should be always a
full commit id.
@AdamMajer Please review.
Diffstat (limited to 'cmd/hook.go')
| -rw-r--r-- | cmd/hook.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/hook.go b/cmd/hook.go index 6f31c326fd..6a3358853d 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -377,7 +377,7 @@ Gitea or set your environment appropriately.`, "") newCommitIDs[count] = string(fields[1]) refFullNames[count] = git.RefName(fields[2]) - commitID, _ := git.IDFromString(newCommitIDs[count]) + commitID, _ := git.NewIDFromString(newCommitIDs[count]) if refFullNames[count] == git.BranchPrefix+"master" && !commitID.IsZero() && count == total { masterPushed = true } @@ -671,7 +671,7 @@ Gitea or set your environment appropriately.`, "") if err != nil { return err } - commitID, _ := git.IDFromString(rs.OldOID) + commitID, _ := git.NewIDFromString(rs.OldOID) if !commitID.IsZero() { err = writeDataPktLine(ctx, os.Stdout, []byte("option old-oid "+rs.OldOID)) if err != nil { |