build: check reachable git commits

crazy-max · crazy-max · commit 661af29d4651 · 2023-02-08T14:34:23.000+01:00
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com> (cherry picked from commit fd58841)
diff --git a/build/git.go b/build/git.go
@@ -64,7 +64,7 @@ func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath st
 		return res, nil
 	}
 
-	if sha, err := gitc.FullCommit(); err != nil {
+	if sha, err := gitc.FullCommit(); err != nil && !gitutil.IsUnknownRevision(err) {
 		return res, errors.Wrapf(err, "buildx: failed to get git commit")
 	} else if sha != "" {
 		if gitc.IsDirty() {
diff --git a/util/gitutil/gitutil.go b/util/gitutil/gitutil.go
@@ -138,3 +138,12 @@ func (c *Git) clean(out string, err error) (string, error) {
 	}
 	return out, err
 }
+
+func IsUnknownRevision(err error) bool {
+	if err == nil {
+		return false
+	}
+	// https://github.com/git/git/blob/a6a323b31e2bcbac2518bddec71ea7ad558870eb/setup.c#L204
+	errMsg := strings.ToLower(err.Error())
+	return strings.Contains(errMsg, "unknown revision or path not in the working tree") || strings.Contains(errMsg, "bad revision")
+}
diff --git a/util/gitutil/gitutil_test.go b/util/gitutil/gitutil_test.go
@@ -46,6 +46,18 @@ func TestGitShortCommit(t *testing.T) {
 	require.Equal(t, 7, len(out))
 }
 
+func TestGitFullCommitErr(t *testing.T) {
+	Mktmp(t)
+	c, err := New()
+	require.NoError(t, err)
+
+	GitInit(c, t)
+
+	_, err = c.FullCommit()
+	require.Error(t, err)
+	require.True(t, IsUnknownRevision(err))
+}
+
 func TestGitTagsPointsAt(t *testing.T) {
 	Mktmp(t)
 	c, err := New()

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func getGitAttributes(ctx context.Context, contextPath string, dockerfilePath st`
`64`	`64`	`return res, nil`
`65`	`65`	`}`
`66`	`66`
`67`		`- if sha, err := gitc.FullCommit(); err != nil {`
	`67`	`+ if sha, err := gitc.FullCommit(); err != nil && !gitutil.IsUnknownRevision(err) {`
`68`	`68`	`return res, errors.Wrapf(err, "buildx: failed to get git commit")`
`69`	`69`	`} else if sha != "" {`
`70`	`70`	`if gitc.IsDirty() {`
Original file line number	Diff line number	Diff line change
`@@ -138,3 +138,12 @@ func (c *Git) clean(out string, err error) (string, error) {`
`138`	`138`	`}`
`139`	`139`	`return out, err`
`140`	`140`	`}`
	`141`	`+`
	`142`	`+func IsUnknownRevision(err error) bool {`
	`143`	`+ if err == nil {`
	`144`	`+ return false`
	`145`	`+ }`
	`146`	`+ // https://github.com/git/git/blob/a6a323b31e2bcbac2518bddec71ea7ad558870eb/setup.c#L204`
	`147`	`+ errMsg := strings.ToLower(err.Error())`
	`148`	`+ return strings.Contains(errMsg, "unknown revision or path not in the working tree") \|\| strings.Contains(errMsg, "bad revision")`
	`149`	`+}`