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

git/githistory: rename "epath" to "fullpath"

Browse Source
This commit is contained in:
Taylor Blau 2018-02-26 16:17:48 -08:00
parent 2a17ee5c78
commit 6c782f6072
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git/githistory/rewriter.go
View File

@ -310,14 +310,14 @@ func (r *Rewriter) rewriteTree(commitOID []byte, treeOID []byte, path string, fn
entries := make([]*odb.TreeEntry, 0, len(tree.Entries))
for _, entry := range tree.Entries {
var epath string
var fullpath string
if len(path) > 0 {
epath = strings.Join([]string{path, entry.Name}, "/")
fullpath = strings.Join([]string{path, entry.Name}, "/")
} else {
epath = entry.Name
fullpath = entry.Name
}
if !r.allows(entry.Type(), epath) {
if !r.allows(entry.Type(), fullpath) {
entries = append(entries, entry)
continue
}
@ -331,9 +331,9 @@ func (r *Rewriter) rewriteTree(commitOID []byte, treeOID []byte, path string, fn
switch entry.Type() {
case odb.BlobObjectType:
oid, err = r.rewriteBlob(commitOID, entry.Oid, epath, fn, perc)
oid, err = r.rewriteBlob(commitOID, entry.Oid, fullpath, fn, perc)
case odb.TreeObjectType:
oid, err = r.rewriteTree(commitOID, entry.Oid, epath, fn, tfn, perc)
oid, err = r.rewriteTree(commitOID, entry.Oid, fullpath, fn, tfn, perc)
default:
oid = entry.Oid