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

Merge branch 'master' into move-repo

Browse Source
This commit is contained in:
risk danger olson 2016-11-15 10:29:00 -07:00 committed by GitHub
commit 88916ee90e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git/git.go
View File

@ -912,7 +912,6 @@ func CloneWithoutFilters(flags CloneFlags, args []string) error {
// CachedRemoteRefs returns the list of branches & tags for a remote which are // CachedRemoteRefs returns the list of branches & tags for a remote which are
// currently cached locally. No remote request is made to verify them. // currently cached locally. No remote request is made to verify them.
func CachedRemoteRefs(remoteName string) ([]*Ref, error) { func CachedRemoteRefs(remoteName string) ([]*Ref, error) {
var ret []*Ref var ret []*Ref
cmd := subprocess.ExecCommand("git", "show-ref") cmd := subprocess.ExecCommand("git", "show-ref")
@ -936,13 +935,12 @@ func CachedRemoteRefs(remoteName string) ([]*Ref, error) {
ret = append(ret, &Ref{name, RefTypeRemoteBranch, sha}) ret = append(ret, &Ref{name, RefTypeRemoteBranch, sha})
} }
} }
return ret, nil return ret, cmd.Wait()
} }
// RemoteRefs returns a list of branches & tags for a remote by actually // RemoteRefs returns a list of branches & tags for a remote by actually
// accessing the remote vir git ls-remote // accessing the remote vir git ls-remote
func RemoteRefs(remoteName string) ([]*Ref, error) { func RemoteRefs(remoteName string) ([]*Ref, error) {
var ret []*Ref var ret []*Ref
cmd := subprocess.ExecCommand("git", "ls-remote", "--heads", "--tags", "-q", remoteName) cmd := subprocess.ExecCommand("git", "ls-remote", "--heads", "--tags", "-q", remoteName)
@ -970,7 +968,7 @@ func RemoteRefs(remoteName string) ([]*Ref, error) {
} }
} }
} }
return ret, nil return ret, cmd.Wait()
} }
// GetTrackedFiles returns a list of files which are tracked in Git which match // GetTrackedFiles returns a list of files which are tracked in Git which match