diff --git a/util/gitutil/gitutil.go b/util/gitutil/gitutil.go
index cca79f9001f4..0b1ab87398a4 100644
--- a/util/gitutil/gitutil.go
+++ b/util/gitutil/gitutil.go
@@ -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) {
diff --git a/util/gitutil/gitutil_test.go b/util/gitutil/gitutil_test.go
index 8a21b25ef1e7..47c19a94b96e 100644
--- a/util/gitutil/gitutil_test.go
+++ b/util/gitutil/gitutil_test.go
@@ -62,7 +62,7 @@ func TestGitFullCommitErr(t *testing.T) {
 	_, 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) {
@@ -75,7 +75,7 @@ func TestGitShortCommitErr(t *testing.T) {
 	_, err = c.ShortCommit()
 	require.Error(t, err)
 	require.True(t, gitutil.IsUnknownRevision(err))
-	require.False(t, gittestutil.IsAmbiguousArgument(err))
+	require.True(t, gittestutil.IsAmbiguousArgument(err))
 }
 
 func TestGitTagsPointsAt(t *testing.T) {