diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2019-03-20 13:53:02 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-03-20 13:55:48 +0100 |
| commit | a469d047d106034041edf8070cea28eb1babc88b (patch) | |
| tree | 7e07cdd2f9c22cb4ba7a6a8b93d97e3c2a64d037 /pkg/vcs | |
| parent | 6477d5172f284c83184aaefb959f5317e2686fe3 (diff) | |
pkg/vcs: fix git tag --points-at invocation
Turns out older versions of git don't imply --list for --points-at and fail.
So add --list explicitly.
Update #501
Diffstat (limited to 'pkg/vcs')
| -rw-r--r-- | pkg/vcs/linux.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/vcs/linux.go b/pkg/vcs/linux.go index e4684f3e6..3f4425375 100644 --- a/pkg/vcs/linux.go +++ b/pkg/vcs/linux.go @@ -37,7 +37,7 @@ func (ctx *linux) PreviousReleaseTags(commit string) ([]string, error) { func (ctx *linux) previousReleaseTags(commit string, self bool) ([]string, error) { var tags []string if self { - output, err := runSandboxed(ctx.dir, "git", "tag", "--points-at", commit, "--merged", commit, "v*.*") + output, err := ctx.git.git("tag", "--list", "--points-at", commit, "--merged", commit, "v*.*") if err != nil { return nil, err } @@ -46,7 +46,7 @@ func (ctx *linux) previousReleaseTags(commit string, self bool) ([]string, error return nil, err } } - output, err := runSandboxed(ctx.dir, "git", "tag", "--no-contains", commit, "--merged", commit, "v*.*") + output, err := ctx.git.git("tag", "--no-contains", commit, "--merged", commit, "v*.*") if err != nil { return nil, err } @@ -123,8 +123,7 @@ func (ctx *linux) EnvForCommit(commit string, kernelConfig []byte) (*BisectEnv, } // v4.0 doesn't boot with our config nor with defconfig, it halts on an interrupt in x86_64_start_kernel. if !tags["v4.1"] { - _, err := runSandboxed(ctx.dir, "git", "cherry-pick", - "--no-commit", "99124e4db5b7b70daeaaf1d88a6a8078a0004c6e") + _, err := ctx.git.git("cherry-pick", "--no-commit", "99124e4db5b7b70daeaaf1d88a6a8078a0004c6e") if err != nil { return nil, err } |