diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-09-18 11:19:44 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-09-18 11:19:44 +0300 |
| commit | b66774f8cfbdde61d45589d7ac4cc030a086cfc6 (patch) | |
| tree | 87f0778be4b34809b1c9ba36143055a827f4fcb5 | |
| parent | b5937b10d1a386c392adb1ebced2d0c8cb038696 (diff) | |
| parent | a4fe425aa2993193326b0db162ebba915cc4eb58 (diff) | |
Merge branch 'zj-self-compiled-git-version-parsing' into 'master'
git: Support version parsing self compiled binary
See merge request gitlab-org/gitaly!2575
| -rw-r--r-- | internal/git/proto.go | 2 | ||||
| -rw-r--r-- | internal/git/proto_test.go | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/internal/git/proto.go b/internal/git/proto.go index 2ffa81612..69a414820 100644 --- a/internal/git/proto.go +++ b/internal/git/proto.go @@ -151,8 +151,6 @@ func parseVersion(versionStr string) (version, error) { if len(versionSplit) == 4 { if strings.HasPrefix(versionSplit[3], "rc") { ver.rc = true - } else { - return version{}, fmt.Errorf("unknown pre-release identifier %q", versionSplit[3]) } } diff --git a/internal/git/proto_test.go b/internal/git/proto_test.go index 6314ddb2d..3386c41d4 100644 --- a/internal/git/proto_test.go +++ b/internal/git/proto_test.go @@ -105,6 +105,7 @@ func TestSupportsReferenceTransactionHook(t *testing.T) { {"2.28.0.rc0", true}, {"2.28.0.rc2", true}, {"2.28.1", true}, + {"2.28.0.468.g1be91c4e2f", true}, {"3.0.0", true}, } { actual, err := git.SupportsReferenceTransactionHook(tc.version) |