Joey Hess
e1a24974f1
Merge branch 'master' of ssh://git-annex.branchable.com
2013-11-02 20:16:11 -04:00
Joey Hess
dff303aa43
Fix enabling of gcrypt repository accessed over ssh; git-annex-shell gcryptsetup had a bug that caused it to fail with permission denied.
2013-11-02 20:15:40 -04:00
http://joeyh.name/
48d5e0fecc
Added a comment
2013-11-03 00:15:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmWBvsZvSsAL8P2ye3F0OBStjFCVnOImzM
22e7b711c1
2013-11-03 00:14:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
42e19505f7
Added a comment: Confused
2013-11-03 00:13:47 +00:00
Joey Hess
2203690822
really fix gcrypt for 7be69a2491
...
Fixed all the other ones, but forgot to fix gcrypt!
2013-11-02 20:10:54 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
504dbe4e4f
2013-11-03 00:03:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
fcc68d3e32
Added a comment
2013-11-02 23:59:16 +00:00
Joey Hess
b2cca95d1c
clean import list
2013-11-02 19:55:18 -04:00
Joey Hess
a04fe350b8
fix build
2013-11-02 19:54:59 -04:00
http://joeyh.name/
4dd247f0a7
Added a comment
2013-11-02 23:51:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
2fac561e28
Added a comment
2013-11-02 23:49:49 +00:00
http://joeyh.name/
5bb89b28eb
Added a comment
2013-11-02 23:45:39 +00:00
Joey Hess
1de5eb4c81
respond
2013-11-02 19:44:03 -04:00
https://www.google.com/accounts/o8/id?id=AItOawn2MI-Ci-bS9W5NITngsBJiL8LqWYcJ458
990add32d6
Added a comment
2013-11-02 23:36:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
ed587635d9
Added a comment: Deleting repos from different perspectives
2013-11-02 23:33:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
f74bfae6a4
Added a comment: Super confused
2013-11-02 23:30:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
081ce0b4f7
2013-11-02 23:14:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
f3cc842390
2013-11-02 23:12:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
26ff2f95e9
2013-11-02 23:05:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
9a7838ec2c
Added a comment
2013-11-02 22:59:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
c17c529c2c
Added a comment
2013-11-02 22:55:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
36a8684b4e
Added a comment
2013-11-02 22:52:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
6e3961a5ae
Added a comment
2013-11-02 22:48:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
63f45b1f0e
2013-11-02 22:38:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
3a5d760e11
Added a comment
2013-11-02 22:30:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM
2c28d9ad1f
Added a comment
2013-11-02 21:53:38 +00:00
Joey Hess
d87f47cdd1
Merge branch 'master' of ssh://git-annex.branchable.com
2013-11-02 17:07:19 -04:00
Joey Hess
67df9c9e1b
devblog
2013-11-02 17:05:54 -04:00
Joey Hess
768c323e74
add
2013-11-02 16:48:37 -04:00
http://joeyh.name/
6992438022
Added a comment
2013-11-02 20:39:36 +00:00
Joey Hess
7be69a2491
gcrypt, bup: Fix bug that prevented using these special remotes with encryption=pubkey.
...
I think both of these are all that's affected, but I went ahead and fixed
all the remotes that set their config to M.empty to instead store the
actual config. Who knows what will expect it to be actually present in
future, the Remote instance of getGpgEncParams came to..
2013-11-02 16:37:28 -04:00
Joey Hess
a46b653bd6
Merge branch 'master' of ssh://git-annex.branchable.com
2013-11-02 16:10:01 -04:00
Joey Hess
4c8454c891
title
2013-11-02 16:07:18 -04:00
http://joeyh.name/
2745d060b9
Added a comment
2013-11-02 20:03:33 +00:00
http://joeyh.name/
3639b1fe25
Added a comment
2013-11-02 19:54:45 +00:00
http://joeyh.name/
7cc73148ab
Added a comment
2013-11-02 19:46:28 +00:00
http://joeyh.name/
13fbe711bd
Added a comment
2013-11-02 19:42:13 +00:00
http://joeyh.name/
f859a1b838
Added a comment
2013-11-02 19:32:50 +00:00
Joey Hess
bc18cde325
sync: Work even when the local git repository is new and empty, with no master branch.
2013-11-02 15:29:38 -04:00
Joey Hess
43c47b6dbb
Merge branch 'master' of ssh://git-annex.branchable.com
2013-11-02 15:10:53 -04:00
Joey Hess
7e7e765cba
Improve local pairing behavior when two computers both try to start the pairing process separately.
...
I was able to reproduce something very like this bug by starting
pairing separately on both computers under poor network conditions (ie,
weak wifi on my front porch). Neither computer showed an alert for the
PairReq messages it was seeing (intermittently) from the other.
So, I've made a new PairReq message that has not been seen before
always make the alert pop up, even if the assistant thinks it is
in the middle of its own pairing process (or even another pairing
process with a different box on the LAN).
(This shouldn't cause a rogue PairAck to disrupt a pairing process part
way through.)
2013-11-02 15:10:29 -04:00
http://joeyh.name/
db41aba34b
Added a comment
2013-11-02 19:02:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn2MI-Ci-bS9W5NITngsBJiL8LqWYcJ458
f9cf8e24f5
2013-11-02 18:51:43 +00:00
Joey Hess
b5ddb4f0e6
better control character sanity check
...
The msg contains a haskell-escaped string, so control characters in it can
also be escaped. So this didn't work before, really.
Got rid of the \n check, because current pairing messages actually do
contain a \n, after the ssh public key. Don't want to break
back-compatability.
2013-11-02 14:44:10 -04:00
http://joeyh.name/
7d4c0c8f5c
Added a comment
2013-11-02 17:40:19 +00:00
Joey Hess
d92273d243
Merge branch 'master' of ssh://git-annex.branchable.com
2013-11-02 13:39:50 -04:00
Joey Hess
2eca7eb565
fix build w/o webapp (again)
2013-11-02 13:38:44 -04:00
http://joeyh.name/
190785adc0
Added a comment
2013-11-02 17:36:23 +00:00
http://joeyh.name/
0abe1076d2
Added a comment
2013-11-02 17:32:28 +00:00
