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

filter-repo: fix ref-map generation bug when commit at ref tip is pruned

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
Elijah Newren 2019-05-29 19:30:06 -07:00
parent c73c0304b0
commit 1b106eeac9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-filter-repo
View File

@ -3281,7 +3281,7 @@ class RepoFilter(object):
elif old_hash in self._commit_renames:
new_hash = self._commit_renames[old_hash]
new_hash = new_hash if new_hash != None else deleted_hash
else: # Must be an annotated tag
else: # Must be either an annotated tag, or a ref whose tip was pruned
if not batch_check_process:
cmd = 'git cat-file --batch-check'.split()
batch_check_process = subprocess.Popen(cmd,
@ -3292,7 +3292,7 @@ class RepoFilter(object):
batch_check_process.stdin.flush()
line = batch_check_process.stdout.readline()
m = batch_check_output_re.match(line)
if not m or m.group(2) != b'tag':
if not m or m.group(2) not in (b'tag', b'commit'):
raise SystemExit(_("Failed to find new id for %(refname)s "
"(old id was %(old_hash)s)")
% ({'refname': refname, 'old_hash': old_hash})