mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix bug that caused unlocked annexed dotfiles to be added to git by the smudge filter when annex.dotfiles was not set.

Browse source
This commit is contained in:
Joey Hess 2020-03-09 14:20:02 -04:00
parent 96ed67671d
commit 1978a24207
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/Guard_against_previously_annexed_dotfiles_being_converted_to_git_files__63__.mdwn
View file

@ -64,3 +64,5 @@ index 3de500c..7898192 100644
[[!meta author=kyle]]
[[!tag projects/datalad]]
> [[fixed|done]] --[[Joey]]

17
doc/bugs/Guard_against_previously_annexed_dotfiles_being_converted_to_git_files__63__/comment_2_5d0e1468f7ab2e8cd42452812d9ce49b._comment Normal file
View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2020-03-09T18:07:12Z"
content="""
Analysis: Command.Smudge.shouldAnnex was changed
in [[!commit 3cd375723658398a4b15ff8ec19e562ec4622488]] to check, for dotfiles,
if annex.dotfiles is set. If not, it always returns False, so the file
always gets added to git when it's smudged.
After getting a file, git-annex tells git to update its index, which
smudges the file. Of course, there are also plenty of other things that can
cause a file to be smudged.
Bad. Fix is very easy, luckily. It just needs to, rather than returning
False, checking if the file was annexed, same as is done for non-dotfiles.
"""]]