From 99eb27623c9509c0801e4301a02e8e7016c23e29 Mon Sep 17 00:00:00 2001 From: Taylor Blau Date: Mon, 7 Aug 2017 20:48:00 -0600 Subject: [PATCH] git/githistory: internally represent root trees as path="" --- git/githistory/rewriter.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git/githistory/rewriter.go b/git/githistory/rewriter.go index 1826d4d0..6ccd2b83 100644 --- a/git/githistory/rewriter.go +++ b/git/githistory/rewriter.go @@ -182,7 +182,7 @@ func (r *Rewriter) Rewrite(opt *RewriteOptions) ([]byte, error) { } // Rewrite the tree given at that commit. - rewrittenTree, err := r.rewriteTree(original.TreeID, string(os.PathSeparator), opt.blobFn(), opt.treeFn()) + rewrittenTree, err := r.rewriteTree(original.TreeID, "", opt.blobFn(), opt.treeFn()) if err != nil { return nil, err } @@ -317,7 +317,7 @@ func (r *Rewriter) rewriteTree(sha []byte, path string, fn BlobRewriteFn, tfn Tr })) } - rewritten, err := tfn(path, &odb.Tree{Entries: entries}) + rewritten, err := tfn(string(os.PathSeparator)+path, &odb.Tree{Entries: entries}) if err != nil { return nil, err }