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: ensure compatibility with upcoming git-2.22

Browse Source 
The upcoming git-2.22 release will not have the --reencode option to
fast-export; however, since we default to --reencode=yes and that was
the default behavior in all existing versions of git (only to change in
git-2.23), we can just silently leave the option off if we detect we are
running with this version.  However, the diff-tree --combined-all-paths
option from git-2.22 is still mandatory; we cannot run with git versions
older than that (well, with -rc or built-from-source versions, but that
won't matter to most users).

Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
Elijah Newren 2019-05-21 14:54:04 -07:00
parent 3999349be4
commit 8e482d18a5
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
git-filter-repo
View File

@ -2183,15 +2183,31 @@ class FilteringOptions(object):
if any(x[0] == 'rename' for x in args.path_changes):
raise SystemExit(_("Error: --use-base-name and --path-rename are "
"incompatible."))
# Also throw in a sanity check on git version here;
# PERF: remove this check once new enough git versions are common
p = subprocess.Popen('git diff-tree -h'.split(),
# Also throw some sanity checks on git version here;
# PERF: remove these checks once new enough git versions are common
p = subprocess.Popen('git fast-export -h'.split(),
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
p.wait()
output = p.stdout.read()
if b'--combined-all-paths' not in output:
raise SystemExit(_("Error: need a version of git whose diff-tree command "
"has the --combined-all-paths option")) # pragma: no cover
if b'--reencode' not in output: # pragma: no cover
if args.preserve_commit_encoding:
raise SystemExit(_("Error: need a version of git whose fast-export "
"command has the --reencode option"))
else:
# Set args.preserve_commit_encoding to None which we'll check for later
# to avoid passing --reencode=yes to fast-export (that option was the
# default prior to git-2.23)
args.preserve_commit_encoding = None
# If we don't have fast-exoprt --reencode, we may also be missing
# diff-tree --combined-all-paths, which is even more important...
p = subprocess.Popen('git diff-tree -h'.split(),
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
p.wait()
output = p.stdout.read()
if b'--combined-all-paths' not in output:
raise SystemExit(_("Error: need a version of git whose diff-tree "
"command has the --combined-all-paths option"))
# End of sanity checks on git version
@staticmethod
def get_replace_text(filename):
@ -3176,8 +3192,9 @@ class RepoFilter(object):
extra_flags.append('--no-data')
if use_done_feature:
extra_flags.append('--use-done-feature')
reencode = 'no' if self._args.preserve_commit_encoding else 'yes'
extra_flags.append('--reencode='+reencode)
if self._args.preserve_commit_encoding is not None: # pragma: no cover
reencode = 'no' if self._args.preserve_commit_encoding else 'yes'
extra_flags.append('--reencode='+reencode)
location = ['-C', self._args.source] if self._args.source else []
fep_cmd = ['git'] + location + ['fast-export', '--show-original-ids',
'--signed-tags=strip', '--tag-of-filtered-object=rewrite',