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

run restagePointerFiles in adjustedBranchRefreshFull

Browse source 
Avoid failure to update adjusted branch --unlock-present after git-annex
drop when annex.adjustedbranchrefresh=1

At higher values, it did flush the queue, which ran restagePointerFiles.
But at 1, adjustedBranchRefreshFull gets added to the queue, and while
restagePointerFiles is also in the queue, it runs after that.

Sponsored-by: Brock Spratlen on Patreon
This commit is contained in:
Joey Hess 2023-03-23 16:23:56 -04:00
parent d580ea2120
commit cb4d9f7b1f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 88 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/Failed_adjusted_branch_update_after_error_in_drop/comment_1_08b3eafdabe5f60ec2206584dff5d230._comment
View file

@ -6,4 +6,6 @@
I assume this is a --hide-missing adjusted branch?
Update: Oh, I see from a forum post that it's --unlock-present actually.
What is the annex.adjustedbranchrefresh git config set to?
"""]]

42
doc/bugs/Failed_adjusted_branch_update_after_error_in_drop/comment_2_a947f8afde3d7f63fd33b0b7e5998e43._comment Normal file
View file

@ -0,0 +1,42 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2023-03-23T19:35:33Z"
content="""
I was able to reproduce something that looks similar to this without
needing to interrupt any command:
joey@darkstar:~/tmp/bench>git clone a b
Cloning into 'b'...
done.
joey@darkstar:~/tmp/bench>cd b
joey@darkstar:~/tmp/bench/b>git config annex.adjustedbranchrefresh 1
joey@darkstar:~/tmp/bench/b>git annex adjust --unlock-present
adjust
Switched to branch 'adjusted/master(unlockpresent)'
ok
joey@darkstar:~/tmp/bench/b#master(unlockpresent)>ls
foo@
joey@darkstar:~/tmp/bench/b#master(unlockpresent)>git-annex get
get foo (from origin...)
ok
(recording state in git...)
joey@darkstar:~/tmp/bench/b#master(unlockpresent)>ls
foo
joey@darkstar:~/tmp/bench/b#master(unlockpresent)>git-annex drop
drop foo ok
error: Your local changes to the following files would be overwritten by checkout:
foo
Please commit your changes or stash them before you switch branches.
Aborting
Updating adjusted branch failed.
(recording state in git...)
And it was left in a similar detached head status:
HEAD detached at 2aab85d
nothing to commit, working tree clean
This seems be be a bug with the implementation of annex.adjustedbranchrefresh
"""]]

23
doc/bugs/Failed_adjusted_branch_update_after_error_in_drop/comment_3_c8ce6c9fc35fa6ad5165ecf9a3592c9d._comment Normal file
View file

@ -0,0 +1,23 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2023-03-23T19:50:45Z"
content="""
git-annex is what writes that detached HEAD,
in updateAdjustedBranch. And I've verified that when it fails like this,
git status shows the file is modified. But of course the modification is
only that the annex content has been replaced by an annex pointer. Running
`git add` on the file makes the modification status go away.
And this only happens when annex.adjustedbranchrefresh=1.
At higher values, it calls Annex.Queue.flush, but at 1 it does not, and so
restagePointerFiles does not get called before adjustedBranchRefreshFull.
(Or at least may not, they're both running as cleanup actions and order is
not really defined.)
I wonder if there are other situations where modifications can prevent
checkout of the updated adjusted branch? Eg, what if the user has made some
other modification to an annexed file? It seems wise for git-annex to
defend against it in depth, by making sure no crash can leave it in
detached head state.
"""]]