diff --git a/git-filter-repo b/git-filter-repo index f116385..83c55cb 100755 --- a/git-filter-repo +++ b/git-filter-repo @@ -3516,7 +3516,7 @@ class RepoFilter(object): contents = subproc.check_output(cmd) except subprocess.CalledProcessError as e: # pragma: no cover raise SystemExit(_("Failed loading %s from %s") % - (decode(marks_basename), branch)) + (decode(marks_basename), full_branch)) if contents: biggest_id = max(int(x.split()[0][1:]) for x in contents.splitlines()) _IDS._next_id = max(_IDS._next_id, biggest_id+1) diff --git a/t/t9391/erroneous.py b/t/t9391/erroneous.py index db6051b..133840f 100755 --- a/t/t9391/erroneous.py +++ b/t/t9391/erroneous.py @@ -9,7 +9,7 @@ near the top of git-filter-repo import git_filter_repo as fr def handle_tag(tag): - print("Decipher this: "+''.join(reversed(progress.message))) + print("Tagger: "+''.join(tag.tagger_name)) args = fr.FilteringOptions.parse_args(['--force', '--tag-callback', 'pass']) filter = fr.RepoFilter(args, tag_callback = handle_tag)