From f887b2d7c96b0447410f5fdc557260d97a5ac61d Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Mon, 26 Sep 2022 16:15:26 -0400 Subject: [PATCH 1/2] clean-ignore: move commands under main function Signed-off-by: Francis Charette Migneault --- contrib/filter-repo-demos/clean-ignore | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/contrib/filter-repo-demos/clean-ignore b/contrib/filter-repo-demos/clean-ignore index 9dacff8..d2d2c12 100755 --- a/contrib/filter-repo-demos/clean-ignore +++ b/contrib/filter-repo-demos/clean-ignore @@ -18,6 +18,7 @@ near the top of git-filter-repo. import argparse import os import subprocess +import sys try: import git_filter_repo as fr except ImportError: @@ -65,7 +66,14 @@ class CheckIgnores: commit.file_changes = [x for x in commit.file_changes if x.filename not in bad] -checker = CheckIgnores() -args = fr.FilteringOptions.default_options() -filter = fr.RepoFilter(args, commit_callback=checker.skip_ignores) -filter.run() + +def main(): + checker = CheckIgnores() + args = fr.FilteringOptions.default_options() + filter = fr.RepoFilter(args, commit_callback=checker.skip_ignores) + filter.run() + + +if __name__ == '__main__': + main() + From 48967362470bd5a385ffc57efbd96cca7e50f7a0 Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Mon, 26 Sep 2022 16:15:51 -0400 Subject: [PATCH 2/2] clean-ignore: use arguments provided as input instead of enforced defaults Signed-off-by: Francis Charette Migneault --- contrib/filter-repo-demos/clean-ignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/filter-repo-demos/clean-ignore b/contrib/filter-repo-demos/clean-ignore index d2d2c12..06823ee 100755 --- a/contrib/filter-repo-demos/clean-ignore +++ b/contrib/filter-repo-demos/clean-ignore @@ -69,7 +69,7 @@ class CheckIgnores: def main(): checker = CheckIgnores() - args = fr.FilteringOptions.default_options() + args = fr.FilteringOptions.parse_args(sys.argv[1:]) filter = fr.RepoFilter(args, commit_callback=checker.skip_ignores) filter.run()