Commit graph

956 commits

Author SHA1 Message Date
http://joeyh.name/
6cf1b3eb15 Added a comment 2014-07-15 18:53:47 +00:00
Joey Hess
4e44bda4cc Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-15 14:28:21 -04:00
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
http://joeyh.name/
82eca051f5 Added a comment 2014-07-15 18:23:50 +00:00
http://svario.it/gioele
65ea8409ec Added a comment 2014-07-15 06:54:40 +00:00
http://joeyh.name/
15c4a21c81 Added a comment 2014-07-14 18:38:58 +00:00
http://joeyh.name/
3bf484a7dc Added a comment 2014-07-14 18:30:38 +00:00
http://joeyh.name/
309f180130 Added a comment 2014-07-14 18:27:43 +00:00
http://ypid.wordpress.com/
53210e3220 Added a comment: gitignore 2014-07-12 17:59:42 +00:00
http://svario.it/gioele
df53f96063 new feature: do not import new files 2014-07-12 14:18:59 +00:00
http://svario.it/gioele
4059b9aefe New topic "Recovering from a bad sync" 2014-07-12 09:00:19 +00:00
Joey Hess
398ad93afa Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-11 17:00:50 -04:00
Joey Hess
cb66ca3a76 resolvemerge: New plumbing command that runs the automatic merge conflict resolver. 2014-07-11 16:45:18 -04:00
http://joeyh.name/
e69d37a0ae Added a comment 2014-07-11 20:17:06 +00:00
zardoz
4f0ca08ba5 Added a comment 2014-07-11 11:54:26 +00:00
zardoz
089a23b291 Added a comment 2014-07-11 11:46:08 +00:00
Joey Hess
9d71903c2f migrate: Avoid re-checksumming when migrating from hashE to hash backend. 2014-07-10 17:06:04 -04:00
Joey Hess
564de5e508 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-10 16:28:13 -04:00
Joey Hess
b66b33c87f promote comment to todo 2014-07-10 16:27:12 -04:00
http://joeyh.name/
29d2b5bf22 Added a comment 2014-07-10 19:54:30 +00:00
http://joeyh.name/
98a051eab8 Added a comment 2014-07-10 19:37:38 +00:00
Joey Hess
f0fc2568d7 move to todo 2014-07-10 15:18:12 -04:00
http://olivier.mehani.name/
a3e7a98445 Added a comment 2014-07-09 01:09:33 +00:00
zardoz
1b3c94b82d 2014-07-08 13:16:10 +00:00
zardoz
32a0403542 Added a comment 2014-07-07 12:48:07 +00:00
zardoz
fddbec98f5 2014-07-07 12:06:01 +00:00
cehteh
f964f40be7 2014-06-27 07:35:11 +00:00
Joey Hess
9fb8038166 Windows: Assistant now logs to daemon.log.
Yes, this means that git annex webapp on windows execs git-annex, which
execs itself to set env, and the execs itself again to redirect logs.

This is disgusting. This is Windows(TM).
2014-06-17 19:27:54 -04:00
Joey Hess
3b914da9bc
update 2014-06-17 14:33:47 -04:00
Joey Hess
611cd84bb2 Merge branch 'master' of ssh://git-annex.branchable.com 2014-06-17 14:31:09 -04:00
Joey Hess
5977e161f3 close 2014-06-17 14:07:16 -04:00
http://joeyh.name/
32c7fdc0f2 Added a comment 2014-06-17 17:18:34 +00:00
http://joeyh.name/
e027801e6e Added a comment 2014-06-17 17:10:28 +00:00
http://joeyh.name/
914ed75599 Added a comment 2014-06-17 16:56:32 +00:00
http://joeyh.name/
5f3f9601c9 Added a comment 2014-06-17 16:52:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm9ocq1Kb0WL-cz-LPpvd2Xm-q8tIQvqXA
ec14987706 Added a comment 2014-06-17 00:01:35 +00:00
http://joeyh.name/
4a4238a373 Added a comment 2014-06-16 23:48:03 +00:00
http://joeyh.name/
672f359260 Added a comment 2014-06-16 23:47:36 +00:00
Joey Hess
257223c748 branch 2014-06-16 19:12:38 -04:00
Joey Hess
0af4dd673c permissions ugh 2014-06-16 19:12:01 -04:00
Joey Hess
d27891a70d split out windows service todo 2014-06-16 18:34:51 -04:00
http://olivier.mehani.name/
7ba53fe00c Added a comment 2014-06-14 14:15:55 +00:00
http://olivier.mehani.name/
ed2f71e422 Added a comment: Manual solution 2014-06-14 13:59:38 +00:00
http://joeyh.name/
32037f0cc0 Added a comment 2014-06-10 19:11:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm9ocq1Kb0WL-cz-LPpvd2Xm-q8tIQvqXA
f4eecd8b4a Added a comment 2014-06-10 18:24:22 +00:00
http://joeyh.name/
26121a4f94 Added a comment: nssm notes 2014-06-10 18:16:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmHp5oVW8Z9v_vHs5FRtlYj80TYMQWVTS0
5ec8bcfaa7 Added a comment 2014-06-10 02:18:43 +00:00
http://sunny256.sunbase.org/
a48b9af487 Suggest --byte-limit option 2014-06-07 02:56:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm5WyknJirJJridJjiPNgrlYxGG9xrZBvA
df06773d1d Added a comment 2014-06-06 10:49:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm9ocq1Kb0WL-cz-LPpvd2Xm-q8tIQvqXA
09b23da2ec Added a comment 2014-06-05 16:42:02 +00:00