write_tree: suppress double-slash in blob HTML filename
When emitting a blob in the root tree of a commit, write_tree() composes the blob's HTML filename with an extra slash before the "f=", like this: output/r/repo/b/master/t//f=README.txt.html Although the double-slash is not harmful on Unix, it is unsightly, and may be problematic for other platforms or filesystems which interpret double-slash specially or disallow it. Therefore, suppress the extra slash for blobs in the root tree. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
This commit is contained in:
parent
aaf2968538
commit
d7604dab4d
5
git-arr
5
git-arr
@ -347,8 +347,9 @@ def generate(output, skip_index = False):
|
|||||||
dirname = git.smstr(os.path.dirname(oname.raw))
|
dirname = git.smstr(os.path.dirname(oname.raw))
|
||||||
fname = git.smstr(os.path.basename(oname.raw))
|
fname = git.smstr(os.path.basename(oname.raw))
|
||||||
write_to(
|
write_to(
|
||||||
'r/%s/b/%s/t/%s/f=%s.html' %
|
'r/%s/b/%s/t/%s%sf=%s.html' %
|
||||||
(str(r.name), str(bn), dirname.raw, fname.raw),
|
(str(r.name), str(bn),
|
||||||
|
dirname.raw, '/' if dirname.raw else '', fname.raw),
|
||||||
blob, (r, bn, fname.url, dirname.url), mtime)
|
blob, (r, bn, fname.url, dirname.url), mtime)
|
||||||
else:
|
else:
|
||||||
write_to('r/%s/b/%s/t/%s/index.html' %
|
write_to('r/%s/b/%s/t/%s/index.html' %
|
||||||
|
Loading…
Reference in New Issue
Block a user