lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commands: verify locks on all pushed refs

Browse Source
This commit is contained in:
rick olson 2017-11-02 14:11:45 -06:00
parent 645998d262
commit 9064b637c2
2 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
commands/lockverifier.go
View File

@ -11,7 +11,6 @@ import (
"github.com/git-lfs/git-lfs/lfsapi"
"github.com/git-lfs/git-lfs/locking"
"github.com/git-lfs/git-lfs/tq"
"github.com/rubyist/tracerx"
)
type verifyState byte
@ -23,12 +22,9 @@ const (
)
func verifyLocksForUpdates(lv *lockVerifier, updates []*refUpdate) {
lv.Verify(cfg.RemoteRefName())
/*
for _, update := range updates {
lv.Verify(update.Right().Name)
}
// */
for _, update := range updates {
lv.Verify(update.Right().Name)
}
}
// lockVerifier verifies locked files before updating one or more refs.
@ -53,7 +49,6 @@ func (lv *lockVerifier) Verify(ref string) {
return
}
tracerx.Printf("LOCK VERIFY %q", ref)
lockClient := newLockClient()
ours, theirs, err := lockClient.VerifiableLocks(ref, 0)
if err != nil {

29
config/config.go
View File

@ -166,35 +166,6 @@ func (c *Configuration) CurrentRef() *git.Ref {
return c.ref
}
func (c *Configuration) RemoteRef() *git.Ref {
r := c.CurrentRef()
c.loading.Lock()
defer c.loading.Unlock()
if c.remoteRef != nil {
return c.remoteRef
}
if r != nil {
merge, _ := c.Git.Get(fmt.Sprintf("branch.%s.merge", r.Name))
if len(merge) > 0 {
c.remoteRef = git.ParseRef(merge, "")
} else {
c.remoteRef = r
}
}
return c.remoteRef
}
func (c *Configuration) RemoteRefName() string {
if r := c.RemoteRef(); r != nil {
return r.Name
}
return ""
}
func (c *Configuration) IsDefaultRemote() bool {
return c.Remote() == defaultRemote
}