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 parse all merge parents, even if some became pruned

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
Elijah Newren 2018-11-10 14:13:22 -08:00
parent 424faa3103
commit 9b88f3f094
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
git-filter-repo
View File

@ -993,12 +993,19 @@ class FastExportFilter(object):
self._translate_commit_hash,
commit_msg)
parents = []
parents.append(self._parse_optional_parent_ref('from'))
merge_ref = self._parse_optional_parent_ref('merge')
while merge_ref:
parents.append(merge_ref)
merge_ref = self._parse_optional_parent_ref('merge')
parents = [self._parse_optional_parent_ref('from')]
# Due to empty pruning, we can have real 'from' and 'merge' lines that
# due to commit rewriting map to a parent of None. We need to record
# 'from' if its non-None, and we need to parse all 'merge' lines.
while self._currentline.startswith('merge '):
parents.append(self._parse_optional_parent_ref('merge'))
# Since we may have added several 'None' parents due to empty pruning,
# get rid of all the non-existent parents
parents = [x for x in parents if x is not None]
# However, the splitting below into from_commit and merge_commits means
# we'd rather a parentless commit be represented as one None entry
if not parents:
parents.append(None)
was_merge = len(parents) > 1
# Remove redundant parents (if both sides of history are empty commits,