docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 09:17:49 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Remove git warning: buildx/1633

Browse Source 
Signed-off-by: David Gageot <david.gageot@docker.com>
This commit is contained in:
David Gageot 2023-02-16 07:34:54 +01:00
parent 1f73f4fd5d
commit d4a4aaf509
No known key found for this signature in database
GPG Key ID: 93C3F22BE5D3A40B
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/gitutil/gitutil.go
View File

@ -80,11 +80,11 @@ func (c *Git) RemoteURL() (string, error) {
} }
func (c *Git) FullCommit() (string, error) { func (c *Git) FullCommit() (string, error) {
return c.clean(c.run("show", "--format=%H", "HEAD", "--quiet")) return c.clean(c.run("show", "--format=%H", "HEAD", "--quiet", "--"))
} }
func (c *Git) ShortCommit() (string, error) { func (c *Git) ShortCommit() (string, error) {
return c.clean(c.run("show", "--format=%h", "HEAD", "--quiet")) return c.clean(c.run("show", "--format=%h", "HEAD", "--quiet", "--"))
} }
func (c *Git) Tag() (string, error) { func (c *Git) Tag() (string, error) {

14
util/gitutil/gitutil_test.go
View File

@ -56,6 +56,20 @@ func TestGitFullCommitErr(t *testing.T) {
_, err = c.FullCommit() _, err = c.FullCommit()
require.Error(t, err) require.Error(t, err)
require.True(t, IsUnknownRevision(err)) require.True(t, IsUnknownRevision(err))
require.False(t, IsAmbiguousArgument(err))
}
func TestGitShortCommitErr(t *testing.T) {
Mktmp(t)
c, err := New()
require.NoError(t, err)
GitInit(c, t)
_, err = c.ShortCommit()
require.Error(t, err)
require.True(t, IsUnknownRevision(err))
require.False(t, IsAmbiguousArgument(err))
} }
func TestGitTagsPointsAt(t *testing.T) { func TestGitTagsPointsAt(t *testing.T) {

9
util/gitutil/testutil.go
View File

@ -2,6 +2,7 @@ package gitutil
import ( import (
"os" "os"
"strings"
"testing" "testing"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -73,3 +74,11 @@ func fakeGit(c *Git, args ...string) (string, error) {
allArgs = append(allArgs, args...) allArgs = append(allArgs, args...)
return c.clean(c.run(allArgs...)) return c.clean(c.run(allArgs...))
} }
func IsAmbiguousArgument(err error) bool {
if err == nil {
return false
}
errMsg := strings.ToLower(err.Error())
return strings.Contains(errMsg, "use '--' to separate paths from revisions")
}