diff options
| author | Michael Muré <batolettre@gmail.com> | 2019-11-19 21:31:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-19 21:31:29 +0100 |
| commit | 6345895a3d9a055927f1d4b78f254a55c1d271b6 (patch) | |
| tree | 20d7d7c0e7cac6998f8af3bc3b431656a8d4dcff | |
| parent | f35845d328e7e1151051070b2f98b903050a1326 (diff) | |
| parent | 76b612936dc52f7f50cd4a62de8cefa09ce65e1e (diff) | |
| download | git-bug-6345895a3d9a055927f1d4b78f254a55c1d271b6.tar.gz | |
Merge pull request #258 from MichaelMure/fixes
Bridges fixes
| -rw-r--r-- | bridge/core/token.go | 2 | ||||
| -rw-r--r-- | bridge/github/config.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bridge/core/token.go b/bridge/core/token.go index 2ceabca2..449ebbb5 100644 --- a/bridge/core/token.go +++ b/bridge/core/token.go @@ -43,7 +43,7 @@ func NewToken(value, target string) *Token { } func (t *Token) ID() entity.Id { - sum := sha256.Sum256([]byte(t.Value)) + sum := sha256.Sum256([]byte(t.Target + t.Value)) return entity.Id(fmt.Sprintf("%x", sum)) } diff --git a/bridge/github/config.go b/bridge/github/config.go index 434a2c63..e76a14f4 100644 --- a/bridge/github/config.go +++ b/bridge/github/config.go @@ -11,6 +11,7 @@ import ( "net/http" "os" "regexp" + "sort" "strconv" "strings" "syscall" @@ -471,6 +472,8 @@ func getValidGithubRemoteURLs(remotes map[string]string) []string { } } + sort.Strings(urls) + return urls } |