9e3bc45b93
When a merge conflict occurs, it obviously isn't possible to check out the file using git lfs checkout or git lfs pull, since it's unclear which revision the user wants. git lfs checkout handles this gracefully by just ignoring the conflict, whereas git lfs pull causes a full logged error, which is excessive. Let's make git lfs pull match the behavior of git lfs checkout here by having it ignore malformed pointer files just like it ignores files that are not pointers.
187 lines
4.5 KiB
Go
187 lines
4.5 KiB
Go
package commands
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"sync"
|
|
|
|
"github.com/git-lfs/git-lfs/config"
|
|
"github.com/git-lfs/git-lfs/errors"
|
|
"github.com/git-lfs/git-lfs/git"
|
|
"github.com/git-lfs/git-lfs/lfs"
|
|
"github.com/git-lfs/git-lfs/subprocess"
|
|
"github.com/git-lfs/git-lfs/tq"
|
|
)
|
|
|
|
// Handles the process of checking out a single file, and updating the git
|
|
// index.
|
|
func newSingleCheckout(gitEnv config.Environment, remote string) abstractCheckout {
|
|
manifest := getTransferManifestOperationRemote("download", remote)
|
|
|
|
clean, ok := gitEnv.Get("filter.lfs.clean")
|
|
if !ok || len(clean) == 0 {
|
|
return &noOpCheckout{manifest: manifest}
|
|
}
|
|
|
|
// Get a converter from repo-relative to cwd-relative
|
|
// Since writing data & calling git update-index must be relative to cwd
|
|
pathConverter, err := lfs.NewRepoToCurrentPathConverter(cfg)
|
|
if err != nil {
|
|
Panic(err, "Could not convert file paths")
|
|
}
|
|
|
|
return &singleCheckout{
|
|
gitIndexer: &gitIndexer{},
|
|
pathConverter: pathConverter,
|
|
manifest: manifest,
|
|
}
|
|
}
|
|
|
|
type abstractCheckout interface {
|
|
Manifest() *tq.Manifest
|
|
Skip() bool
|
|
Run(*lfs.WrappedPointer)
|
|
RunToPath(*lfs.WrappedPointer, string) error
|
|
Close()
|
|
}
|
|
|
|
type singleCheckout struct {
|
|
gitIndexer *gitIndexer
|
|
pathConverter lfs.PathConverter
|
|
manifest *tq.Manifest
|
|
}
|
|
|
|
func (c *singleCheckout) Manifest() *tq.Manifest {
|
|
return c.manifest
|
|
}
|
|
|
|
func (c *singleCheckout) Skip() bool {
|
|
return false
|
|
}
|
|
|
|
func (c *singleCheckout) Run(p *lfs.WrappedPointer) {
|
|
cwdfilepath := c.pathConverter.Convert(p.Name)
|
|
|
|
// Check the content - either missing or still this pointer (not exist is ok)
|
|
filepointer, err := lfs.DecodePointerFromFile(cwdfilepath)
|
|
if err != nil && !os.IsNotExist(err) {
|
|
if errors.IsNotAPointerError(err) || errors.IsBadPointerKeyError(err) {
|
|
// File has non-pointer content, leave it alone
|
|
return
|
|
}
|
|
|
|
LoggedError(err, "Checkout error: %s", err)
|
|
return
|
|
}
|
|
|
|
if filepointer != nil && filepointer.Oid != p.Oid {
|
|
// User has probably manually reset a file to another commit
|
|
// while leaving it a pointer; don't mess with this
|
|
return
|
|
}
|
|
|
|
if err := c.RunToPath(p, cwdfilepath); err != nil {
|
|
if errors.IsDownloadDeclinedError(err) {
|
|
// acceptable error, data not local (fetch not run or include/exclude)
|
|
Error("Skipped checkout for %q, content not local. Use fetch to download.", p.Name)
|
|
} else {
|
|
FullError(fmt.Errorf("could not check out %q", p.Name))
|
|
}
|
|
return
|
|
}
|
|
|
|
// errors are only returned when the gitIndexer is starting a new cmd
|
|
if err := c.gitIndexer.Add(cwdfilepath); err != nil {
|
|
Panic(err, "Could not update the index")
|
|
}
|
|
}
|
|
|
|
// RunToPath checks out the pointer specified by p to the given path. It does
|
|
// not perform any sort of sanity checking or add the path to the index.
|
|
func (c *singleCheckout) RunToPath(p *lfs.WrappedPointer, path string) error {
|
|
gitfilter := lfs.NewGitFilter(cfg)
|
|
return gitfilter.SmudgeToFile(path, p.Pointer, false, c.manifest, nil)
|
|
}
|
|
|
|
func (c *singleCheckout) Close() {
|
|
if err := c.gitIndexer.Close(); err != nil {
|
|
LoggedError(err, "Error updating the git index:\n%s", c.gitIndexer.Output())
|
|
}
|
|
}
|
|
|
|
type noOpCheckout struct {
|
|
manifest *tq.Manifest
|
|
}
|
|
|
|
func (c *noOpCheckout) Manifest() *tq.Manifest {
|
|
return c.manifest
|
|
}
|
|
|
|
func (c *noOpCheckout) Skip() bool {
|
|
return true
|
|
}
|
|
|
|
func (c *noOpCheckout) RunToPath(p *lfs.WrappedPointer, path string) error {
|
|
return nil
|
|
}
|
|
|
|
func (c *noOpCheckout) Run(p *lfs.WrappedPointer) {}
|
|
func (c *noOpCheckout) Close() {}
|
|
|
|
// Don't fire up the update-index command until we have at least one file to
|
|
// give it. Otherwise git interprets the lack of arguments to mean param-less update-index
|
|
// which can trigger entire working copy to be re-examined, which triggers clean filters
|
|
// and which has unexpected side effects (e.g. downloading filtered-out files)
|
|
type gitIndexer struct {
|
|
cmd *subprocess.Cmd
|
|
input io.WriteCloser
|
|
output bytes.Buffer
|
|
mu sync.Mutex
|
|
}
|
|
|
|
func (i *gitIndexer) Add(path string) error {
|
|
i.mu.Lock()
|
|
defer i.mu.Unlock()
|
|
|
|
if i.cmd == nil {
|
|
// Fire up the update-index command
|
|
cmd := git.UpdateIndexFromStdin()
|
|
cmd.Stdout = &i.output
|
|
cmd.Stderr = &i.output
|
|
stdin, err := cmd.StdinPipe()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = cmd.Start()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
i.cmd = cmd
|
|
i.input = stdin
|
|
}
|
|
|
|
i.input.Write([]byte(path + "\n"))
|
|
return nil
|
|
}
|
|
|
|
func (i *gitIndexer) Output() string {
|
|
return i.output.String()
|
|
}
|
|
|
|
func (i *gitIndexer) Close() error {
|
|
i.mu.Lock()
|
|
defer i.mu.Unlock()
|
|
|
|
if i.input != nil {
|
|
i.input.Close()
|
|
}
|
|
|
|
if i.cmd != nil {
|
|
return i.cmd.Wait()
|
|
}
|
|
|
|
return nil
|
|
}
|