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

git/githistory: promote assignment of path variable

Browse Source
This commit is contained in:
Taylor Blau 2017-06-05 12:25:36 -06:00
parent 9dee264acb
commit d50dc8c3ee
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git/githistory/rewriter.go
View File

@ -161,6 +161,8 @@ func (r *Rewriter) rewriteTree(sha []byte, path string, fn BlobRewriteFn) ([]byt
entries := make([]*odb.TreeEntry, 0, len(tree.Entries))
for _, entry := range tree.Entries {
path := filepath.Join(path, entry.Name)
if cached := r.uncacheEntry(entry); cached != nil {
entries = append(entries, cached)
continue
@ -170,9 +172,9 @@ func (r *Rewriter) rewriteTree(sha []byte, path string, fn BlobRewriteFn) ([]byt
switch entry.Type {
case odb.BlobObjectType:
oid, err = r.rewriteBlob(entry.Oid, filepath.Join(path, entry.Name), fn)
oid, err = r.rewriteBlob(entry.Oid, path, fn)
case odb.TreeObjectType:
oid, err = r.rewriteTree(entry.Oid, filepath.Join(path, entry.Name), fn)
oid, err = r.rewriteTree(entry.Oid, path, fn)
default:
oid = entry.Oid