Marown/git-filter-repo
1
0
Fork 0
mirror of https://github.com/newren/git-filter-repo.git synced 2024-07-06 18:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

filter-repo: fix tracking of referenced-but-removed commits

Browse Source 
Since there were multiple places in the code where we returned early
knowing that we didn't have a translation of old_hash to a new_hash, we
need to update _commits_referenced_but_removed from each of them.

Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
Elijah Newren 2019-03-11 19:29:53 -07:00
parent 5c72ac5343
commit 8e7ab2fbfe
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-filter-repo
View File

@ -1164,11 +1164,13 @@ class FastExportFilter(object):
new_hash = self._get_rename(old_hash)
if new_hash is None:
if old_hash[0:7] not in self._commit_short_old_hashes:
self._commits_referenced_but_removed.add(old_hash)
return old_hash
possibilities = self._commit_short_old_hashes[old_hash[0:7]]
matches = [x for x in possibilities
if x[0:orig_len] == old_hash]
if len(matches) != 1:
self._commits_referenced_but_removed.add(old_hash)
return old_hash
old_hash = matches[0]
new_hash = self._get_rename(old_hash)