mirror of
https://github.com/newren/git-filter-repo.git
synced 2024-06-29 15:15:39 +02:00
Support git 2.43
Git 2.43 changes --mark-tags to --[no-]mark-tags and --reencode to --[no-]reencode. Use both options for the detection check. Signed-off-by: Vladimir Petko <vladimir.petko@canonical.com> [en: rewrapped commit message] Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
parent
4bc9022afc
commit
7c5be8e303
|
@ -2067,13 +2067,13 @@ EXAMPLES
|
|||
if b'--anonymize-map' not in output: # pragma: no cover
|
||||
global date_format_permissive
|
||||
date_format_permissive = False
|
||||
if b'--mark-tags' not in output: # pragma: no cover
|
||||
if not any(x in output for x in [b'--mark-tags',b'--[no-]mark-tags']): # pragma: no cover
|
||||
global write_marks
|
||||
write_marks = False
|
||||
if args.state_branch:
|
||||
# We need a version of git-fast-export with --mark-tags
|
||||
raise SystemExit(_("Error: need git >= 2.24.0"))
|
||||
if b'--reencode' not in output: # pragma: no cover
|
||||
if not any(x in output for x in [b'--reencode', b'--[no-]reencode']): # pragma: no cover
|
||||
if args.preserve_commit_encoding:
|
||||
# We need a version of git-fast-export with --reencode
|
||||
raise SystemExit(_("Error: need git >= 2.23.0"))
|
||||
|
|
Loading…
Reference in New Issue
Block a user