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

14941 commits

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
http://joeyh.name/
82eca051f5 Added a comment 2014-07-15 18:23:50 +00:00
feulif
f989c48159 Added a comment 2014-07-15 18:03:56 +00:00
http://joeyh.name/
d2ef0ba3ca Added a comment 2014-07-15 17:36:22 +00: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=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
732d2fb1f1 2014-07-15 17:17:53 +00: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
https://www.google.com/accounts/o8/id?id=AItOawmN5jDf53oRJZsTo8Ahj2uXzCzq6HcvEro
622a3761ae Added a comment: confirmed? 2014-07-15 01:29:00 +00:00
lex
69bd61e559 Added a comment 2014-07-14 22:21:32 +00:00
Joey Hess
63090c50fc Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-14 16:56:07 -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
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
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
http://joeyh.name/
1906ffca53 Added a comment 2014-07-14 18:33:25 +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://joeyh.name/
1663ee3d3f Added a comment 2014-07-14 18:21:15 +00:00
annexuser
98333c511d Added a comment 2014-07-14 18:21:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmveNWaFIL1zEehHr_0416bKBzsul5tGlE
e86807ea0b 2014-07-14 10:11:31 +00:00
sts
62d5fa1a17 Added a comment 2014-07-14 09:12:13 +00:00
divB
05311ae0f6 2014-07-14 02:39:15 +00:00
divB
26821a851b 2014-07-14 02:23:35 +00:00
jg123h12jh3y12g3y
09d9aa656e 2014-07-14 02:08:55 +00:00
jg123h12jh3y12g3y
5254ef67ba 2014-07-14 02:05:14 +00:00
sts
92c3c7f961 2014-07-13 09:04:24 +00:00
lex
48868f5b01 2014-07-13 06:52:38 +00:00
zardoz
a384c61d57 2014-07-12 20:12:36 +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
68455bbe4e New bug "sync does not commit with alwasycommit = false" 2014-07-12 10:59:49 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
2f54ec7727 Added a comment 2014-07-12 10:03:07 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
191477bb9f Added a comment 2014-07-12 10:00:59 +00:00
http://svario.it/gioele
4059b9aefe New topic "Recovering from a bad sync" 2014-07-12 09:00:19 +00:00
divB
f6b3f61c30 2014-07-12 02:28:32 +00:00
divB
0985ce2925 2014-07-12 02:07:46 +00:00
divB
58f1065fe5 Added a comment 2014-07-11 21:56:29 +00:00
divB
ebe00602b5 Added a comment 2014-07-11 21:43:11 +00:00
Joey Hess
398ad93afa Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-11 17:00:50 -04:00
Joey Hess
d71aaabeab devblog 2014-07-11 17:00:20 -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
http://joeyh.name/
0f43fc0116 Added a comment 2014-07-11 19:57:36 +00:00
Joey Hess
003ebf58f5 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-11 15:53:02 -04:00
Joey Hess
aadf11cf99 moreinfo 2014-07-11 15:52:54 -04:00
http://joeyh.name/
ac152c1255 Added a comment 2014-07-11 19:46:05 +00:00
http://joeyh.name/
348866612f Added a comment 2014-07-11 19:42:24 +00:00
http://joeyh.name/
7aff9410e0 Added a comment 2014-07-11 19:40:32 +00:00
http://joeyh.name/
53e1d72a30 Added a comment: unable to reproduce, please provide transcript 2014-07-11 19:36:37 +00:00
Joey Hess
793004e2c2 moreinfo 2014-07-11 15:34:41 -04:00
http://joeyh.name/
7003be56ad Added a comment 2014-07-11 19:31:52 +00:00
http://joeyh.name/
d5ec73d200 Added a comment 2014-07-11 19:29:06 +00:00
Joey Hess
50b1cd917a Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-11 14:52:57 -04:00
Joey Hess
c5f132e3e7 uninit: Avoid failing final removal in some direct mode repositories due to file modes. 
Specifically .map files.
 2014-07-11 14:52:53 -04:00
http://joeyh.name/
b88a04346a Added a comment 2014-07-11 18:41:32 +00:00
Joey Hess
ee9ffcd940 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-11 14:30:59 -04:00
http://joeyh.name/
5636ba495b Added a comment 2014-07-11 18:30:55 +00:00
http://joeyh.name/
76ff54c246 Added a comment 2014-07-11 18:27:44 +00:00
http://joeyh.name/
694a44b464 Added a comment 2014-07-11 18:15:09 +00:00
Joey Hess
e8845fc9b5 close; local misconfiguration 2014-07-11 14:13:24 -04:00
http://joeyh.name/
ad1eabe61d Added a comment: obvious questions 2014-07-11 18:12:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
da4be5c108 Added a comment 2014-07-11 18:10:06 +00:00
http://joeyh.name/
e265748fd7 Added a comment 2014-07-11 18:09:51 +00:00
Joey Hess
f22a77890e improve documentation about sync 2014-07-11 14:08:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
91f834d20e Added a comment 2014-07-11 17:11:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
6a2ae73f42 Added a comment 2014-07-11 17:06:43 +00:00
zardoz
07c322752c 2014-07-11 13:27:00 +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
CandyAngel
3355275161 Added a comment 2014-07-11 10:57:58 +00:00
CandyAngel
f59fc3da9f Added a comment 2014-07-11 10:41:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmveNWaFIL1zEehHr_0416bKBzsul5tGlE
ff6f62e544 2014-07-11 10:08:06 +00:00
http://svario.it/gioele
bcf5c41904 New bug: git-annex sync does not push 2014-07-11 09:25:14 +00:00
http://svario.it/gioele
b0eef01f37 Added a comment: GPG_AGENT_INFO was already set in the outside shell 2014-07-11 07:19:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmveNWaFIL1zEehHr_0416bKBzsul5tGlE
fac19f5b91 Added a comment: Install fails horribly 2014-07-10 23:11:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawndSPd52H_L7hcYsJjLQ4kR1LopprHy7Xw
3700fb00af 2014-07-10 22:37:59 +00:00
Joey Hess
f14890bf82 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-10 17:06:23 -04:00
Joey Hess
9d71903c2f migrate: Avoid re-checksumming when migrating from hashE to hash backend. 2014-07-10 17:06:04 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk3JJvaarUKd7xShCMze_kpHVcuCzFrWTI
ab233c9a1c 2014-07-10 21:03:50 +00: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/
5553c4dcd6 Added a comment 2014-07-10 20:24:04 +00:00
http://joeyh.name/
6bfc13556f Added a comment 2014-07-10 20:16:28 +00:00
http://joeyh.name/
fe80c9897a Added a comment 2014-07-10 19:59:15 +00:00
http://joeyh.name/
29d2b5bf22 Added a comment 2014-07-10 19:54:30 +00:00
http://joeyh.name/
3a6cb53e96 Added a comment 2014-07-10 19:50:38 +00:00
http://joeyh.name/
79ce1a226f Added a comment 2014-07-10 19:41:54 +00:00
http://joeyh.name/
98a051eab8 Added a comment 2014-07-10 19:37:38 +00:00
Joey Hess
32b2f2af38 moreinfo 2014-07-10 15:26:04 -04:00
Joey Hess
f0fc2568d7 move to todo 2014-07-10 15:18:12 -04:00
Joey Hess
088816353e Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-10 15:18:02 -04:00
http://joeyh.name/
d651e3cf7a Added a comment 2014-07-10 19:19:36 +00:00
http://joeyh.name/
2a7fd68d47 Added a comment 2014-07-10 19:10:15 +00:00
Joey Hess
be2c77d0cb close 2014-07-10 15:08:30 -04:00
Joey Hess
3c10d8ce57 retitle 2014-07-10 15:05:01 -04:00
Joey Hess
b9892e2344 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-10 15:02:30 -04:00
http://joeyh.name/
56b2b49440 Added a comment: user misconfiguration 2014-07-10 19:02:00 +00:00
Joey Hess
5d34472f82 close; user misconfiguration 2014-07-10 15:00:22 -04:00
http://joeyh.name/
4f62105aa3 Added a comment 2014-07-10 18:48:17 +00:00
Joey Hess
e538f0e980 notabug 2014-07-10 14:24:46 -04:00
http://joeyh.name/
fc48c3bb23 Added a comment 2014-07-10 18:24:17 +00:00
Joey Hess
4c61590541 tagging 2014-07-10 14:22:54 -04:00
http://joeyh.name/
50781a4a5f Added a comment 2014-07-10 18:11:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
9bad3ed3b7 removed 2014-07-10 15:30:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
30d3bd9458 2014-07-10 15:01:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
e488af18b8 still not working 2014-07-10 13:57:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
64748d8094 solution ok 2014-07-10 11:55:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnov5q9_Cl4Ps5NoYE08yE01NLSvBANnY8
61222ad293 Added a comment 2014-07-10 05:50:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
ed153b50d5 small change 2014-07-10 03:07:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
ae676c1bee partially solved 2014-07-10 03:06:17 +00:00
divB
85ae4ce94c 2014-07-10 03:05:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
c30ac2bebe missing word 2014-07-10 02:29:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
7648a6602b formatting 2014-07-10 02:02:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
6c6a5dff0d 2014-07-10 02:01:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao
ac90d4f570 Added a comment: even a client repository you had once but have now deleted 2014-07-09 22:08:44 +00:00
Joey Hess
99d3010618 devblog 2014-07-09 16:20:02 -04:00
Joey Hess
f15d2aa35d update 2014-07-09 16:16:32 -04:00
Joey Hess
0f382a0256 add news item for git-annex 5.20140709 2014-07-09 16:08:50 -04:00
Joey Hess
566e8041ae Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-09 15:32:21 -04:00
http://joeyh.name/
dd171168e4 Added a comment: more confirmation of race theory 2014-07-09 19:26:55 +00:00