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

sync: Fix git sync with local git remotes even when they don't have an annex.uuid set.

Browse source 
Catch an exception when ensureInitialized is run in a non-initted
repository. In this case, just read the git config, so that the Git.Repo
object is not LocalUnknown, which is what is used to represent remotes
on eg, drives that are not connected.

The assistant already got this right, and like with the assistant, this
causes an implicit git-annex init of the local remote on the second sync,
once the git-annex branch has been pushed to it.
See this comment for more analysis:
http://git-annex.branchable.com/todo/Recovering_from_a_bad_sync/#comment-64e469a2c1969829ee149cbb41b1c138

This commit was sponsored by jscit.
This commit is contained in:
Joey Hess 2014-07-15 14:27:43 -04:00
parent a3d73a2cb3
commit 522a0922b8
4 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/todo/Recovering_from_a_bad_sync.mdwn
View file

@ -27,3 +27,5 @@ These sequences of commands create two completely different git histories.
More important, if one clones on pc2 the first repository, they will see both the pc1 remote and the pc2 remote. Instead, if one clones on pc2 the repository created by the second combination of commands, they will see only the pc2 remote.
What commands should I use on pc1 to fix the history so that when pc2 clones from the origin repository it will see both the pc1 remote and its own local remote?
> [[done]]; fixed per my comments. --[[Joey]]