From e42e8ceed792e40ac2874a8a32155545ec1e3e20 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 20 Oct 2017 16:57:33 +0100 Subject: [PATCH] linuxkit pkg: improve handling of git working directory Ensure that all git commands are run as if from the package directory using the `-C` option. Otherwise the various attempts to use git fail if `linuxkit pkg` is invoked from outside the git repo. Signed-off-by: Ian Campbell --- src/cmd/linuxkit/pkglib/build.go | 4 ++-- src/cmd/linuxkit/pkglib/git.go | 38 ++++++++++++++++++++----------- src/cmd/linuxkit/pkglib/pkglib.go | 8 +++++-- 3 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/cmd/linuxkit/pkglib/build.go b/src/cmd/linuxkit/pkglib/build.go index e2a1d50e4..f32c723be 100644 --- a/src/cmd/linuxkit/pkglib/build.go +++ b/src/cmd/linuxkit/pkglib/build.go @@ -71,7 +71,7 @@ func (p Pkg) Build(bos ...BuildOpt) error { } if bo.release == "" { - r, err := gitCommitTag("HEAD") + r, err := p.git.commitTag("HEAD") if err != nil { return err } @@ -101,7 +101,7 @@ func (p Pkg) Build(bos ...BuildOpt) error { args = append(args, "--label", "org.opencontainers.image.source="+p.gitRepo) } if !p.dirty { - commit, err := gitCommitHash("HEAD") + commit, err := p.git.commitHash("HEAD") if err != nil { return err } diff --git a/src/cmd/linuxkit/pkglib/git.go b/src/cmd/linuxkit/pkglib/git.go index ce2f48ce7..de60b5d33 100644 --- a/src/cmd/linuxkit/pkglib/git.go +++ b/src/cmd/linuxkit/pkglib/git.go @@ -19,8 +19,20 @@ func init() { treeHashRe = regexp.MustCompile("^[0-7]{6} [^ ]+ ([0-9a-f]{40})\t.+\n$") } -func gitCommandStdout(args ...string) (string, error) { - cmd := exec.Command("git", args...) +type git struct { + dir string +} + +func newGit(dir string) *git { + return &git{dir} +} + +func (g git) mkCmd(args ...string) *exec.Cmd { + return exec.Command("git", append([]string{"-C", g.dir}, args...)...) +} + +func (g git) commandStdout(args ...string) (string, error) { + cmd := g.mkCmd(args...) cmd.Stderr = os.Stderr if debugGitCommands { @@ -33,8 +45,8 @@ func gitCommandStdout(args ...string) (string, error) { return string(out), nil } -func gitCommand(args ...string) error { - cmd := exec.Command("git", args...) +func (g git) command(args ...string) error { + cmd := g.mkCmd(args...) cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr if debugGitCommands { @@ -43,8 +55,8 @@ func gitCommand(args ...string) error { return cmd.Run() } -func gitTreeHash(pkg, commit string) (string, error) { - out, err := gitCommandStdout("ls-tree", "--full-tree", commit, "--", pkg) +func (g git) treeHash(pkg, commit string) (string, error) { + out, err := g.commandStdout("ls-tree", "--full-tree", commit, "--", pkg) if err != nil { return "", err } @@ -57,8 +69,8 @@ func gitTreeHash(pkg, commit string) (string, error) { return matches[1], nil } -func gitCommitHash(commit string) (string, error) { - out, err := gitCommandStdout("rev-parse", commit) +func (g git) commitHash(commit string) (string, error) { + out, err := g.commandStdout("rev-parse", commit) if err != nil { return "", err } @@ -66,8 +78,8 @@ func gitCommitHash(commit string) (string, error) { return strings.TrimSpace(out), nil } -func gitCommitTag(commit string) (string, error) { - out, err := gitCommandStdout("tag", "-l", "--points-at", commit) +func (g git) commitTag(commit string) (string, error) { + out, err := g.commandStdout("tag", "-l", "--points-at", commit) if err != nil { return "", err } @@ -75,7 +87,7 @@ func gitCommitTag(commit string) (string, error) { return strings.TrimSpace(out), nil } -func gitIsDirty(pkg, commit string) (bool, error) { +func (g git) isDirty(pkg, commit string) (bool, error) { // If it isn't HEAD it can't be dirty if commit != "HEAD" { return false, nil @@ -86,11 +98,11 @@ func gitIsDirty(pkg, commit string) (bool, error) { // because `git diff-index` only uses the `lstat` result and // not the actual file contents. Running `git update-index // --refresh` updates the cache. - if err := gitCommand("update-index", "-q", "--refresh"); err != nil { + if err := g.command("update-index", "-q", "--refresh"); err != nil { return false, err } - err := gitCommand("diff-index", "--quiet", commit, "--", pkg) + err := g.command("diff-index", "--quiet", commit, "--", pkg) if err == nil { return false, nil } diff --git a/src/cmd/linuxkit/pkglib/pkglib.go b/src/cmd/linuxkit/pkglib/pkglib.go index a5578d7f9..1b44f003a 100644 --- a/src/cmd/linuxkit/pkglib/pkglib.go +++ b/src/cmd/linuxkit/pkglib/pkglib.go @@ -36,6 +36,7 @@ type Pkg struct { hash string dirty bool commitHash string + git *git } // NewFromCLI creates a Pkg from a set of CLI arguments. Calls fs.Parse() @@ -138,7 +139,9 @@ func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) { } }) - gitDirty, err := gitIsDirty(hashPath, hashCommit) + git := newGit(pkgPath) + + gitDirty, err := git.isDirty(hashPath, hashCommit) if err != nil { return Pkg{}, err } @@ -146,7 +149,7 @@ func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) { dirty = dirty || gitDirty if hash == "" { - if hash, err = gitTreeHash(hashPath, hashCommit); err != nil { + if hash, err = git.treeHash(hashPath, hashCommit); err != nil { return Pkg{}, err } @@ -167,6 +170,7 @@ func NewFromCLI(fs *flag.FlagSet, args ...string) (Pkg, error) { cache: !pi.DisableCache, dirty: dirty, pkgPath: pkgPath, + git: git, }, nil }