github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2901 from rvs/master

Browse Source 
Make it possible to key the package tags off of top level tree hash
This commit is contained in:
Avi Deitcher 2018-02-03 18:44:34 +02:00 committed by GitHub
commit 1c1d159e5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cmd/linuxkit/pkglib/git.go
View File

@ -84,7 +84,21 @@ func (g git) isWorkTree(pkg string) (bool, error) {
}
func (g git) treeHash(pkg, commit string) (string, error) {
out, err := g.commandStdout(os.Stderr, "ls-tree", "--full-tree", commit, "--", pkg)
// we have to check if pkg is at the top level of the git tree,
// if that's the case we need to use tree hash from the commit itself
out, err := g.commandStdout(nil, "rev-parse", "--prefix", pkg, "--show-toplevel")
if err != nil {
return "", err
}
if strings.TrimSpace(out) == pkg {
out, err = g.commandStdout(nil, "show", "--format=%T", "-s", commit)
if err != nil {
return "", err
}
return strings.TrimSpace(out), nil
}
out, err = g.commandStdout(os.Stderr, "ls-tree", "--full-tree", commit, "--", pkg)
if err != nil {
return "", err
}