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

comment

Browse source
This commit is contained in:
Joey Hess 2025-05-14 13:48:59 -04:00
parent 59c729a4b6
commit 45e356bf64
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
doc/forum/git_assistant_creates_random_antagonistic_commits/comment_4_f1471089baacb15090fd1ca9160a3bfe._comment Normal file
View file

@ -0,0 +1,20 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2025-05-14T17:30:12Z"
content="""
The assistant is seeing changes that are made in the process of populating
an annex pointer file with the file content on get, or replacing the file
content with the pointer file on drop.
For example, Annex/Content/PointerFile.hs in populatePointerFile
calls removeFile before replaceWorkTreeFile. I'm not sure why it needs to
do that, but since that's non-atomic, there's a window for the assistant
to see the file got deleted and commit the deletion, followed by committing
that it got added back.
In depopulatePointerFile, it's more clear why it does a non-atomic
replacement, since it calls secureErase on the file.
`git config annex.delayadd 1` will probably effectively avoid the problem.
"""]]