Hi,
when I fetch from a central repository and git annex merge
a synced/master branch is created. How can I disable this behaviour?
Or is there a better workflow for getting and pushing updates from/to a central git repo?
bye
Hi,
when I fetch from a central repository and git annex merge
a synced/master branch is created. How can I disable this behaviour?
Or is there a better workflow for getting and pushing updates from/to a central git repo?
bye
Why is this a problem? You can delete the branch at any time of course if it's in the way.
It would be possible for
git-annex sync
to avoid creating the synced/master branch at all when syncing with a bare git repository, but this would actually make it less efficient and slower. Where currently it makes one push, updating the remote's master branch when possible, and forcing an update of its synced/master branch at the same time, it would instead need to first try to update remote's master, then check if that succeeded and if not force the update of synced/master. Also, it's not clear how to check if the push to master succeeded, since something else might update it further in a race.I suppose that
git annex sync/merge
could delete the local synced/* branches once it was done merging them. This wouldn't preventgit pull
from pulling down those branches, though.Thank you for the answer.
There are no origin/synced/* branches, only a origin/git-annex and the local git-annex branch. What i need git annex merge to do, is to merge the fetched remote git-annex with the local git-annex. There is no need for creating or merging the synced-branches as there are no.
git annex merge
does not create any synced/* branches. These branches will be pulled down bygit pull
orgit annex sync
.delete the synced/master branch:
$ git branch -d synced/master Branch synced/master entfernt (war 20ec8b3).
then call annex merge:
$ git annex merge merge git-annex ok
check branches:
$ git branch -a git-annex * master synced/master remotes/origin/git-annex remotes/origin/master
and there is the synced/master branch again.But that's not my problem. My problem was: how to use annex with a central repository. I done that by deleting all remote synced/* branches. And now I'm updating the git-annex branch by
git fetch
ing andgit annex merge
ing again.PS: the MD for code blocks is broken
So, I was wrong about
git annex merge
creating the synced/master branch.There's no good reason for it to do that, so I've fixed it not to create it.