Commit graph

8199 commits

Author SHA1 Message Date
Joey Hess
a1b28e476a Regression test for union merge bug
Fixed in 0214e0fb17
2013-01-17 16:28:35 -04:00
Joey Hess
7272179979 avoid running pre-commit hook in direct mode
The code that handles committing unlocked files in indirect mode did
something unexpected and data lossy.
2013-01-17 14:11:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
9cee5b43c2 Added a comment: MediaFire REST API 2013-01-17 16:53:41 +00:00
http://joeyh.name/
19ddb71da3 Added a comment 2013-01-17 16:44:26 +00:00
http://joeyh.name/
a89d11a34c Added a comment 2013-01-17 16:29:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
cd73cd29f0 Added a comment: MediaFire 2013-01-17 12:17:54 +00:00
http://christian.amsuess.com/chrysn
f1e30f7104 Added a comment 2013-01-17 12:04:34 +00:00
http://christian.amsuess.com/chrysn
b1cb40ee95 poll vote (I need to be able to restrict in which repo dirs changes get auto-committed) 2013-01-17 11:57:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn7gQ1zZDdWhXy9H51W2krZYShNmKL3qfM
66a02a3c9e Added a comment 2013-01-17 08:30:55 +00:00
128.61.104.52
be2736f6e2 poll vote (I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try git remote add, since there is no clear method to completely forget a git-annex remote...) 2013-01-17 04:00:21 +00:00
http://a-or-b.myopenid.com/
67f275dba4 Added a comment 2013-01-17 02:13:03 +00:00
http://a-or-b.myopenid.com/
866e8fd345 2013-01-17 02:11:45 +00:00
http://a-or-b.myopenid.com/
4821b67a61 Added a comment 2013-01-17 01:57:06 +00:00
Joey Hess
8aeeedcc4e fixed 2013-01-16 21:46:49 -04:00
http://joeyh.name/
78e7a1b054 Added a comment 2013-01-17 01:45:59 +00:00
Joey Hess
1acff2b68f Merge branch 'master' of ssh://git-annex.branchable.com 2013-01-16 21:45:41 -04:00
Joey Hess
52e6eeaf06 drop: fix misleading message 2013-01-16 21:44:42 -04:00
http://joeyh.name/
cd73c2fc31 Added a comment 2013-01-17 01:35:45 +00:00
Joey Hess
e68e65f5a3 Merge branch 'master' of ssh://git-annex.branchable.com 2013-01-16 21:33:08 -04:00
Joey Hess
0214e0fb17 union merge bugfix
Union merges involving two or more repositories could sometimes result in
data from one repository getting lost. This could result in the location
log data becoming wrong, and fsck being needed to fix it.

NB: I audited for any other occurrences of this problem. There are other
places than union merge where multiple changes are fed into update-index
in a stream, but they all involve working copy files being staged, or their
deletion being staged, and in this case it's fine for the later changes
to override the earlier ones.
2013-01-16 21:31:06 -04:00
http://joeyh.name/
2c47bab630 Added a comment 2013-01-17 00:46:28 +00:00
http://a-or-b.myopenid.com/
1f6363aa8d 2013-01-16 23:58:24 +00:00
Joey Hess
65d9ced549 tweaks 2013-01-16 19:52:41 -04:00
http://joeyh.name/
6d59cb8f88 Added a comment 2013-01-16 23:05:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo
61aaea2762 2013-01-16 21:30:23 +00:00
78.97.171.23
50ddd46a3e poll vote (I need a Windows port) 2013-01-16 21:08:05 +00:00
78.97.171.23
fd110cd22a poll vote (I need an Android port) 2013-01-16 21:07:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawniayrgSdVLUc3c6bf93VbO-_HT4hzxmyo
03005ef1c8 2013-01-16 20:42:41 +00:00
Joey Hess
fc3ae389f3 brief blog for the day 2013-01-16 15:58:59 -04:00
Joey Hess
dff001eb47 Merge branch 'master' of ssh://git-annex.branchable.com 2013-01-16 15:47:26 -04:00
Joey Hess
5892a198af add a page collecting related software 2013-01-16 15:46:41 -04:00
Joey Hess
6241d4d085 ubuntu ppa 2013-01-16 15:41:02 -04:00
http://joeyh.name/
ac9854cb4c Added a comment 2013-01-16 19:38:36 +00:00
Joey Hess
9a44addacf update documentation about direct mode safety 2013-01-16 15:35:06 -04:00
Joey Hess
88df952243 Deal with incompatability in gpg2, which caused prompts for encryption passphrases rather than using the supplied --passphrase-fd. 2013-01-16 15:27:46 -04:00
http://joeyh.name/
264bc5354e Added a comment 2013-01-16 19:05:38 +00:00
joksnet
a5e03ba7b1 Added a comment 2013-01-16 17:23:27 +00:00
2a02:418:9999::94
adfbde40ce poll vote (Provide .deb package) 2013-01-16 16:08:38 +00:00
188.216.191.7
0794acaf8c poll vote (Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release.) 2013-01-16 15:15:36 +00:00
http://peter-simons.myopenid.com/
6d1f1533a9 Added a comment: WebDAV without locking 2013-01-16 12:44:16 +00:00
http://joeyh.name/
2fe335622b Added a comment 2013-01-16 02:17:44 +00:00
http://joeyh.name/
79e068c75f Added a comment 2013-01-16 02:17:26 +00:00
http://adamspiers.myopenid.com/
1a1fa8f3e9 Added a comment: just one thing 2013-01-16 01:45:54 +00:00
2001:8b0:641b:0:d04:3ecd:b9c6:e26e
9f1c9c68be poll vote (I need to be able to restrict in which repo dirs changes get auto-committed) 2013-01-16 01:42:44 +00:00
joksnet
400d5769f0 Added a comment: Working now 2013-01-16 01:36:43 +00:00
joksnet
1a0dc755c5 With S3, GPG ask for a new passphrase 2013-01-16 01:19:31 +00:00
https://dzsino.myopenid.com/
4f819e2cf4 Added a comment: dropping a directory remote? 2013-01-15 22:29:15 +00:00
166.205.55.18
4497e5cf33 poll vote (I need an Android port) 2013-01-15 21:09:20 +00:00
166.205.55.18
511fb2d5d1 poll vote (I need a Windows port) 2013-01-15 21:09:03 +00:00
Joey Hess
be73d4ce7b Merge branch 'master' of ssh://git-annex.branchable.com 2013-01-15 16:50:22 -04:00