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 1 commit into
base: master
Choose a base branch
from
+7 −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
1 commit
Select commit
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
9 changes: 6 additions & 3 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 Expand Up @@ -185,8 +185,11 @@ func IsUnknownRevision(err error) bool {
return false
}
// https://github.com/git/git/blob/a6a323b31e2bcbac2518bddec71ea7ad558870eb/setup.c#L204
// https://github.com/git/git/blob/1adf5bca8c3cf778103548b9355777cf2d12efdd/builtin/rev-parse.c#L585
errMsg := strings.ToLower(err.Error())
return strings.Contains(errMsg, "unknown revision or path not in the working tree") || strings.Contains(errMsg, "bad revision")
return strings.Contains(errMsg, "unknown revision or path not in the working tree") ||
strings.Contains(errMsg, "bad revision") ||
strings.Contains(errMsg, "needed a single revision")
}

// stripCredentials takes a URL and strips username and password from it.
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ 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) {
Expand Down