Skip to content

Commit

Permalink
Simplifies diff-filter for modified files except deletes
Browse files Browse the repository at this point in the history
This comes by recommendation of @newren in the thread related to buildinspace#221.

I could only see this being regrettable if a new filter type was added
that Peru doesn't want. I speculate that such is unlikely so this is
probably safe.

[1]: https://lore.kernel.org/git/CABPp-BEZj4opBu+wo2whOCHrck1qMjZXfDY9tAE5FbB=Wr9F_w@mail.gmail.com/
  • Loading branch information
colindean committed Dec 17, 2021
1 parent 802e975 commit 101cb47
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions peru/cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,11 @@ async def working_copy_matches_index(self):
return len(diff_output) == 0

async def get_modified_files_skipping_deletes(self):
# We want to ignore deleted files, so we include every possible value
# of --diff-filter except 'D'.
# We want to ignore deleted files, so we exclude only deletes using
# 'd' instead of including all of the capital letter forms.
# https://git-scm.com/docs/git-diff#Documentation/git-diff.txt---diff-filterACDMRTUXB82308203
diff_output = await self.git('diff-files', '-z', '--name-only',
'--diff-filter=ACMRTUXB')
'--diff-filter=d')
return [name for name in diff_output.split('\x00') if name]

async def get_new_files_in_tree(self, previous_tree, new_tree):
Expand Down

0 comments on commit 101cb47

Please sign in to comment.