Marown/git-filter-repo
1
0
Fork 0
mirror of https://github.com/newren/git-filter-repo.git synced 2024-07-04 01:15:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

filter-repo: ensure we properly quote a filename

Browse Source 
When we invoked the 'ls' command of fast-import, we just passed the
filename as-is.  That will work for most filenames, but some have to
be quoted.  Make sure we do so.

Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
Elijah Newren 2019-04-27 15:04:27 -07:00
parent 805ce360fa
commit 5f06c19c55
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-filter-repo
View File

@ -1311,11 +1311,12 @@ class FastExportFilter(object):
# buffers filling up so I instead read from it as I go.
for change in commit.file_changes:
parent = new_1st_parent or commit.parents[0] # exists due to above checks
self._output.write("ls :{} {}\n".format(parent, change.filename))
quoted_filename = PathQuoting.enquote(change.filename)
self._output.write("ls :{} {}\n".format(parent, quoted_filename))
self._output.flush()
parent_version = fi_output.readline().split()
if change.type == 'D':
if parent_version != ['missing', change.filename]:
if parent_version != ['missing', quoted_filename]:
return False
else:
blob_sha = change.blob_id
@ -1323,7 +1324,7 @@ class FastExportFilter(object):
self._output.write("get-mark :{}\n".format(change.blob_id))
self._output.flush()
blob_sha = fi_output.readline().rstrip()
if parent_version != [change.mode, 'blob', blob_sha, change.filename]:
if parent_version != [change.mode, 'blob', blob_sha, quoted_filename]:
return False
return True