mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
20502 commits 13 branches 442 tags 103 MiB
Commit graph

20502 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
522a0922b8 sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. 
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.
 2014-07-15 14:27:43 -04:00
Joey Hess
a3d73a2cb3 meant to close this before 2014-07-15 13:35:23 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk3JJvaarUKd7xShCMze_kpHVcuCzFrWTI
542804ad2c Added a comment 2014-07-15 16:18:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
b09b4c1563 2014-07-15 16:17:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
7230dc525c 2014-07-15 13:57:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
c7ff64f99d 2014-07-15 13:56:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
cba832a9f2 2014-07-15 13:55:21 +00:00
http://ypid.wordpress.com/
578bb64225 Fixed typos. 2014-07-15 13:46:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
76c1f3109b Added a comment: web remote 2014-07-15 13:19:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkpIIYg6Fl7OFsOHVPEchZYj68A3dk4lVg
e306d828dc removed 2014-07-15 12:05:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkpIIYg6Fl7OFsOHVPEchZYj68A3dk4lVg
32ea276fcb Added a comment: install log 2014-07-15 12:03:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkpIIYg6Fl7OFsOHVPEchZYj68A3dk4lVg
69c3107a88 Added a comment: install log 2014-07-15 12:02:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkpIIYg6Fl7OFsOHVPEchZYj68A3dk4lVg
dd5664d729 2014-07-15 12:01:29 +00:00
jg123h12jh3y12g3y
daf1683321 Added a comment 2014-07-15 07:58:15 +00:00
zardoz
9178019bc3 Added a comment 2014-07-15 07:29:37 +00:00
http://svario.it/gioele
65ea8409ec Added a comment 2014-07-15 06:54:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk8xEkJYawrAEwjKPBTYv8eMrMQY-cP4bo
70ad153032 2014-07-15 06:13:10 +00:00
divB
07c1c459ce Added a comment 2014-07-15 05:43:36 +00:00
divB
f6d817c2c4 2014-07-15 05:00:53 +00:00
divB
17c106bb89 2014-07-15 04:43:45 +00:00
Joey Hess
82adf65067 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-15 00:40:34 -04:00
Joey Hess
de3f07e93e devblog 2014-07-15 00:21:54 -04:00
divB
3834dffac4 Added a comment 2014-07-15 04:03:16 +00:00
divB
d6f715417f Added a comment 2014-07-15 03:11:18 +00:00
Joey Hess
4dd5591a55 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-14 21:42:44 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmN5jDf53oRJZsTo8Ahj2uXzCzq6HcvEro
622a3761ae Added a comment: confirmed? 2014-07-15 01:29:00 +00:00
Joey Hess
c17bac346f provide utf-8 locale to avoid silly build failure 2014-07-14 21:18:24 -04:00
lex
69bd61e559 Added a comment 2014-07-14 22:21:32 +00:00
Joey Hess
6bff8291f1 Merge orca:/tmp/build 2014-07-14 17:57:50 -04:00
Joey Hess
4aa9265042 refresh haskell patches 2014-07-14 17:58:13 -04:00
Joey Hess
919de66f1a better fix for modal 2014-07-14 17:45:21 -04:00
Joey Hess
63090c50fc Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-14 16:56:07 -04:00
Joey Hess
f268c2c8ee remove bloomfilter patch no longer needed 2014-07-14 16:55:48 -04:00
http://joeyh.name/
c1ee43a616 Added a comment 2014-07-14 20:54:32 +00:00
Joey Hess
909f04aee2 metadata 2014-07-14 16:53:21 -04:00
Joey Hess
e6b824a8b1 fix missing display of modal body when generating gpg key 2014-07-14 16:41:05 -04:00
http://joeyh.name/
22c4f35961 Added a comment 2014-07-14 20:20:28 +00:00
http://joeyh.name/
4377c1fc88 Added a comment 2014-07-14 20:15:07 +00:00
Joey Hess
6ce2290326 belated thanks to Kevin McKenzie for hosting the OSX autobuilder 
was previously thanked on thanks page.
 2014-07-14 16:07:35 -04:00
http://joeyh.name/
3f755d8666 Added a comment 2014-07-14 20:06:04 +00:00
Joey Hess
27d5eaa0cb Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-14 16:02:58 -04:00
Joey Hess
3e4cb0e7f9 fix windows build 2014-07-14 15:55:48 -04:00
Joey Hess
339a3b8ab0 Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). 
Reversion introduced in 9fb8038166.
The locking code was wrong; the webapp re-ran itself, saw pid was locked,
and so didn't start!
 2014-07-14 15:52:00 -04:00
zardoz
f6fc066ddb Added a comment 2014-07-14 19:34:31 +00:00
http://joeyh.name/
be2751b32a Added a comment 2014-07-14 19:05:33 +00:00
http://joeyh.name/
538823f509 Added a comment 2014-07-14 18:47:21 +00:00
Joey Hess
2416ed18c4 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-14 14:37:48 -04:00
http://joeyh.name/
15c4a21c81 Added a comment 2014-07-14 18:38:58 +00:00
Joey Hess
b0c5704ae3 already fixed 2014-07-14 14:37:42 -04:00
Joey Hess
618b1d2a38 improve documentation 2014-07-14 14:37:14 -04:00