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

filter-repo: allow running a second filtering operation without --force

Browse Source 
Users may want to run multiple filtering operations, either because it's
easier for them to do it that way, or because they want to combine both
path inclusion and exclusion.  For example:
  git filter-repo --path subdir
  git filter-repo --invert-paths --path subdir/some-big-file
cannot be done in a single step.  However, the first filtering operation
would make the repo not look like a clean clone anymore (because it is
not a clean clone anymore), causing the safety check to trigger and
requiring the --force flag.  But once we've allowed them to do
repository rewriting, there's no point disallowing further rewriting.
So, write a .git/filter-repo/already_ran file when we run and treat the
presence of that file the same as providing a --force flag.

Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
Elijah Newren 2019-02-14 12:45:51 -08:00
parent d0e70a7855
commit 76147f13d4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-filter-repo
View File

@ -1627,6 +1627,9 @@ class FastExportFilter(object):
if not issues_found:
f.write("No filtering problems encountered.")
with open(os.path.join(metadata_dir, 'already_ran'), 'w') as f:
f.write("This file exists to allow you to filter again without --force.")
def get_seen_refs(self):
return self._seen_refs.keys()
@ -2560,7 +2563,9 @@ class RepoFilter(object):
is_bare = GitUtils.is_repository_bare(target_working_dir)
# Do sanity checks from the correct directory
if not self._args.force:
tmp_dir = self.results_tmp_dir(create_if_missing=False)
if not self._args.force and \
not os.path.isfile(os.path.join(tmp_dir, 'already_ran')):
cwd = os.getcwd()
os.chdir(target_working_dir)
RepoFilter.sanity_check(self._orig_refs, is_bare)
@ -2732,11 +2737,11 @@ class RepoFilter(object):
def handle_reset(args, reset, shortname = False):
reset.ref = RepoFilter.new_tagname(args, reset.ref, shortname)
def results_tmp_dir(self):
def results_tmp_dir(self, create_if_missing=True):
working_dir = self._args.target or self._args.source or '.'
git_dir = GitUtils.determine_git_dir(working_dir)
d = os.path.join(git_dir, 'filter-repo')
if not os.path.isdir(d):
if create_if_missing and not os.path.isdir(d):
os.mkdir(d)
return d