diff options
| author | Amine <hilalyamine@gmail.com> | 2019-08-13 16:47:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-13 16:47:24 +0200 |
| commit | cf960bc7a5bd0b7af28d35de33131fb0b5ce5253 (patch) | |
| tree | 5df133c91bb4e1ccc5f9fbeb4664416b93d23bf5 /bug/bug_actions.go | |
| parent | 146894a5657d3b20dbaf769a950b12bd19df499c (diff) | |
| parent | c809d37152ea87a66fc281730042dcb4299a8263 (diff) | |
| download | git-bug-cf960bc7a5bd0b7af28d35de33131fb0b5ce5253.tar.gz | |
Merge pull request #193 from MichaelMure/immutableID
Future proof the operation's ID
Diffstat (limited to 'bug/bug_actions.go')
| -rw-r--r-- | bug/bug_actions.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bug/bug_actions.go b/bug/bug_actions.go index b26d080f..cb0d0f7d 100644 --- a/bug/bug_actions.go +++ b/bug/bug_actions.go @@ -65,8 +65,13 @@ func MergeAll(repo repository.ClockedRepo, remote string) <-chan entity.MergeRes } for _, remoteRef := range remoteRefs { - refSplitted := strings.Split(remoteRef, "/") - id := refSplitted[len(refSplitted)-1] + refSplit := strings.Split(remoteRef, "/") + id := entity.Id(refSplit[len(refSplit)-1]) + + if err := id.Validate(); err != nil { + out <- entity.NewMergeInvalidStatus(id, errors.Wrap(err, "invalid ref").Error()) + continue + } remoteBug, err := readBug(repo, remoteRef) @@ -81,7 +86,7 @@ func MergeAll(repo repository.ClockedRepo, remote string) <-chan entity.MergeRes continue } - localRef := bugsRefPattern + remoteBug.Id() + localRef := bugsRefPattern + remoteBug.Id().String() localExist, err := repo.RefExist(localRef) if err != nil { |