Please describe the problem.
I'm using Git Annex on Windows and Linux.
On Windows - Git annex is using adjusted/main(unlocked)
branch that is syncing to main
. This setup worked reliably for a few weeks
A couple days ago adjusted/main(unlocked)
branch stopped syncing to main
. Currently log looks like this:
commit C (HEAD -> adjusted/main(unlocked))
Date: Wed Feb 8 07:47:49 2023 -0500
New commit on windows - no longer syncing to main
commit B
Date: Mon Jan 30 21:09:41 2023 -0500
git-annex adjusted branch
commit A (origin/synced/main, origin/main, synced/main, main)
Date: Mon Jan 30 21:09:41 2023 -0500
Last commit before sync stopped working
I've tried (several times):
git annex sync
commit
On branch adjusted/main(unlocked)
nothing to commit, working tree clean
ok
git annex sync --cleanup
cleanup local ok
So sync
is reporting that there is nothing to do, but main
branch is not syncing. I've tried adding a new commit to adjusted/main(unlocked)
and the did not help with restoring sync. Not sure what else to try.
Hoping to figure out what caused this. Help is much appreciated!
What steps will reproduce the problem?
Git annex Windows repo stoped syncing. I don't know what caused this. It worked reliably for a few weeks
What version of git-annex are you using? On what operating system?
git-annex version: 10.20221105-g56f824d21 Windows 10 local repository version: 10
Please provide any additional information below.
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
# End of transcript or log.
Update:
I was able to resolve the problem - believe that it was caused by the fact that I changed branch name from
master
tomain
and had leftoverrefs/basis/adjusted/master(unlocked)
.Resolved following this steps:
Tested that sync is now working
For an adjusted branch, git-annex keeps a hidden ref,
refs/basis/adjusted/master(unlocked)
. That ref also needs to be renamed if you're going to rename the adjusted branch and the original branch.It's of course fine to delete the old adjusted branch and re-adjust the new branch.
I think that git-annex should warn if it cannot find the basis ref for an adjusted branch.