Commit graph

17560 commits

Author SHA1 Message Date
Joey Hess
7f810c110f nasty issue with fcntl locks 2015-05-16 13:23:43 -04:00
Joey Hess
d505485b2d devblog 2015-05-14 15:56:56 -04:00
Joey Hess
823bb8031b add annex.used-refspec 2015-05-14 15:44:08 -04:00
Joey Hess
86699ff861 unused: Add --used option, which can specify a set of refs to consider used, rather than the default of considering all refs used. 2015-05-14 15:31:38 -04:00
Joey Hess
5fea6dcab2 more formal spec 2015-05-14 13:11:18 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
b04e589ff3 Added a comment 2015-05-14 16:17:08 +00:00
anarcat
9519bca993 Added a comment: confirmed 2015-05-14 15:50:33 +00:00
https://me.yahoo.com/a/StKYI.ZuofVB3xNCCzjJo.V7Fg--#11600
d708a55c68 Added a comment 2015-05-14 09:31:09 +00:00
skew
0d62a4a5d7 Added a comment: transcript 2015-05-14 04:37:33 +00:00
Joey Hess
48374c67eb response 2015-05-13 11:53:22 -04:00
Joey Hess
99fe624e2f design 2015-05-13 11:30:41 -04:00
Joey Hess
e210a81d9f update 2015-05-12 20:17:30 -04:00
Joey Hess
7ebf234616 Stale transfer lock and info files will be cleaned up automatically when get/unused/info commands are run.
Deleting lock files is tricky, tricky stuff. I think I got it right!
2015-05-12 20:11:23 -04:00
Joey Hess
8c2dd7d8ee Fix an unlikely race that could result in two transfers of the same key running at once.
As discussed in bug report.
2015-05-12 19:39:28 -04:00
Joey Hess
1fd54e986a devblog 2015-05-12 16:36:39 -04:00
Joey Hess
5935578ed2 update 2015-05-12 14:00:53 -04:00
Joey Hess
e27b97d364 Merge branch 'master' into concurrentprogress
Conflicts:
	Command/Fsck.hs
	Messages.hs
	Remote/Directory.hs
	Remote/Git.hs
	Remote/Helper/Special.hs
	Types/Remote.hs
	debian/changelog
	git-annex.cabal
2015-05-12 13:23:22 -04:00
Joey Hess
587b2e9014 Merge branch 'master' of ssh://git-annex.branchable.com 2015-05-12 13:00:22 -04:00
Joey Hess
4b2e3210ea drop: Now supports --all, --unused, and --key. 2015-05-12 13:00:06 -04:00
https://me.yahoo.com/a/StKYI.ZuofVB3xNCCzjJo.V7Fg--#11600
e4b137378f 2015-05-12 15:31:56 +00:00
https://sunny256.wordpress.com/
b371a12641 Added a comment: Create symlink in the root directory 2015-05-12 13:04:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnwNDA50ZupMvOgpgDqzDRyu5B-mYlVwa4
581beaae1c Added a comment 2015-05-12 06:52:05 +00:00
https://me.yahoo.com/a/e1w.8yMTnpUh.5fOXneP92pTdy23XJPwx84uLSM-#aca7c
6a1bf68350 Added a comment: re: backup my data to blue ray disks 2015-05-11 21:13:19 +00:00
Joey Hess
cc5d0a3873 comment 2015-05-11 13:03:41 -04:00
Joey Hess
db5d831d07 import: Refuse to import files that are within the work tree, as that does not make sense and could cause data loss. 2015-05-11 12:57:47 -04:00
Joey Hess
c17f2d25b5 bug submitter appears to have been wrong 2015-05-11 12:05:35 -04:00
CandyAngel
a008f78e26 2015-05-11 15:52:29 +00:00
spwhitton
f6cc3fd0e9 Added a comment 2015-05-11 09:02:11 +00:00
atrent
48037ddb67 2015-05-11 07:37:33 +00:00
Joey Hess
ed4fe02896 disable horrible tab warning, needed in every file that Setup.hs pulls in
This is certianly a cabal bug for not passing the build options in the
cabal file when building Setup.hs.

And, why oh why did ghc enable this warning by default? So unhappy with
this choice.
2015-05-10 16:31:50 -04:00
Joey Hess
f65e7a4cce devblog 2015-05-10 16:21:38 -04:00
Joey Hess
dd069990e8 fix man page example formatting 2015-05-09 14:27:45 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
f561ecee8e 2015-05-09 14:31:32 +00:00
warp
a6d50d4a7b 2015-05-09 12:42:34 +00:00
warp
549414a911 2015-05-09 12:40:38 +00:00
Joey Hess
540e1e86b9 devblog 2015-05-08 18:56:57 -04:00
Joey Hess
883d57fa2e add news item for git-annex 5.20150508 2015-05-08 15:09:08 -04:00
Joey Hess
6a1814abf5 seems that webapp ssh password ssh-agent hack is broken on windows after recent ssh changes 2015-05-08 15:07:23 -04:00
Joey Hess
38e2b95751 use a batch file to run msysgit's ssh, instead of copying
copying failed because dlls are not in path.

This batch file is based on the one msysgit uses to start gitk
2015-05-08 14:26:37 -04:00
Joey Hess
54bee7dad4 Revert "Android: Updated bundled ssh from 6.1p1 to 6.4p1."
This reverts commit 27836a2af9.

Build didn't actually seem to succeed, for both versions of android, so
I'll need to revisit this later.
2015-05-08 13:05:33 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnwNDA50ZupMvOgpgDqzDRyu5B-mYlVwa4
c71476963e 2015-05-08 15:22:53 +00:00
https://launchpad.net/~jktjkt
d5d2413cbb 2015-05-08 12:03:35 +00:00
db48x
5050377d4c 2015-05-08 08:43:37 +00:00
anton
8e96a31d9a Added a comment: Thanks! 2015-05-08 07:11:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkW9u-8uqR62QBZjeTNCXsL7Ds55dAMGbA
f71c23faad 2015-05-08 00:16:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkW9u-8uqR62QBZjeTNCXsL7Ds55dAMGbA
166c6c9281 2015-05-08 00:13:32 +00:00
Joey Hess
c101818cbe devblog 2015-05-07 19:36:48 -04:00
Joey Hess
4aba1c74bd remaining dataenc to sandi conversions
I've tested all the dataenc to sandi conversions except Assistant.XMPP,
and all have unchanged behavior, including behavior on large unicode code
points.
2015-05-07 18:07:13 -04:00
Joey Hess
c98a6fcf49 close 2015-05-07 15:59:55 -04:00
Joey Hess
18fc05ff04 Windows: Roll back to an older version of rsync from cygwin. The newer version has some dependency on a newer ssh from cygwin. 2015-05-07 15:56:40 -04:00