Skip to content

util/gitutil: Full/ShortCommit(): replace git show with git rev-parse #3747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jegorbunov wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −4
Open

util/gitutil: Full/ShortCommit(): replace git show with git rev-parse #3747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
888fb96
util/gitutil: Full/ShortCommit(): replace git show with git rev-parse
jegorbunov Mar 27, 2026
758cdba
util/gitutil: fix TestGitFullCommitErr/TestGitShortCommitErr
jegorbunov Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions util/gitutil/gitutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ func (c *Git) RemoteURL() (string, error) {
}

func (c *Git) FullCommit() (string, error) {
return c.clean(c.run("show", "--format=%H", "HEAD", "--quiet", "--"))
return c.clean(c.run("rev-parse", "HEAD"))
}

func (c *Git) ShortCommit() (string, error) {
return c.clean(c.run("show", "--format=%h", "HEAD", "--quiet", "--"))
return c.clean(c.run("rev-parse", "--short", "HEAD"))
}

func (c *Git) Tag() (string, error) {
Expand Down
4 changes: 2 additions & 2 deletions util/gitutil/gitutil_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
_, err = c.FullCommit()
require.Error(t, err)
require.True(t, gitutil.IsUnknownRevision(err))
require.False(t, gittestutil.IsAmbiguousArgument(err))
require.True(t, gittestutil.IsAmbiguousArgument(err))
}

func TestGitShortCommitErr(t *testing.T) {
Expand All @@ -74,8 +74,8 @@

_, err = c.ShortCommit()
require.Error(t, err)
require.True(t, gitutil.IsUnknownRevision(err))

Check failure on line 77 in util/gitutil/gitutil_test.go

View workflow job for this annotation

GitHub Actions / test-unit (ubuntu-24.04)

Failed: util/gitutil/TestGitShortCommitErr 

=== RUN   TestGitShortCommitErr
    gitutil_test.go:77: 
        	Error Trace:	/home/runner/work/buildx/buildx/util/gitutil/gitutil_test.go:77
        	Error:      	Should be true
        	Test:       	TestGitShortCommitErr
--- FAIL: TestGitShortCommitErr (0.01s)

Check failure on line 77 in util/gitutil/gitutil_test.go

View workflow job for this annotation

GitHub Actions / test-unit (macos-15)

Failed: util/gitutil/TestGitShortCommitErr 

=== RUN   TestGitShortCommitErr
    gitutil_test.go:77: 
        	Error Trace:	/Users/runner/work/buildx/buildx/util/gitutil/gitutil_test.go:77
        	Error:      	Should be true
        	Test:       	TestGitShortCommitErr
--- FAIL: TestGitShortCommitErr (0.05s)

Check failure on line 77 in util/gitutil/gitutil_test.go

View workflow job for this annotation

GitHub Actions / test-unit (windows-2025)

Failed: util/gitutil/TestGitShortCommitErr 

=== RUN   TestGitShortCommitErr
    gitutil_test.go:77: 
        	Error Trace:	D:/a/buildx/buildx/util/gitutil/gitutil_test.go:77
        	Error:      	Should be true
        	Test:       	TestGitShortCommitErr
--- FAIL: TestGitShortCommitErr (0.12s)
require.False(t, gittestutil.IsAmbiguousArgument(err))
require.True(t, gittestutil.IsAmbiguousArgument(err))
}

func TestGitTagsPointsAt(t *testing.T) {
Expand Down
Loading