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

4244 commits

Author SHA1 Message Date
Joey Hess
3fb291f482 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-04 23:24:16 -04:00
Joey Hess
1f98d6fb00 glacier: Pass --region to glacier checkpresent. 
I suppose this is not necessary when it has a local cache, so I didn't
notice it was missing.
 2014-03-04 23:22:24 -04:00
http://joeyh.name/
5dcc8555d2 Added a comment 2014-03-05 03:15:44 +00:00
http://joeyh.name/
43ae02e572 Added a comment 2014-03-05 03:14:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnoIxJHzKbUOdNo41pRxRBj_y1bSoH-ziA
1aaa7a44cc 2014-03-05 01:25:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
38a216abb2 Added a comment 2014-03-04 11:01:13 +00:00
Joey Hess
1fbf5f608d Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-04 02:11:20 -04:00
Joey Hess
4a847cdc08 finish fixing direct mode merge bug involving unstaged local files 
Added test cases for both ways this can happen, with a conflict involving a
file, or a directory.

Cleaned up resolveMerge to not touch the work tree in direct mode, which
turned out to be the only way to handle things.. And makes it much nicer.

Still need to run test suite on windows.
 2014-03-04 02:03:15 -04:00
http://joeyh.name/
d6c69b8d66 Added a comment 2014-03-03 21:58:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
bf981aa1d0 2014-03-03 20:34:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmOvQXLmGkQAUOIkPBQtsd9d45NqcX80M
28c97d3104 2014-03-03 20:27:58 +00:00
Joey Hess
eef1b7a3cc fixed initial reported problem but not out of the woods yet in some related cases 2014-03-03 15:00:54 -04:00
http://joeyh.name/
c8e4c76302 2014-03-03 18:12:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk
502743b801 Added a comment 2014-03-03 14:05:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk
db47b041f1 Added a comment 2014-03-03 14:01:11 +00:00
https://id.koumbit.net/anarcat
b7b1d2d3ff Added a comment 2014-03-02 16:33:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawntVnR-Z5ghYInvsElbDeADPSuCsF18iTY
53a431ea3a Added a comment: XMPP something to do with it? 2014-03-02 13:48:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
5378e8fcda Added a comment 2014-03-01 11:23:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
e4723688e2 2014-03-01 10:39:11 +00:00
Joey Hess
d41367cc08 remove buggy --listen=host:port support 2014-02-28 22:53:26 -04:00
Joey Hess
7ac37a7854 Probe for quvi version at run time. 
Overhead: git annex addurl runs quvi --version once.
And more bloat to Annex state..
 2014-02-28 14:54:02 -04:00
EskildHustvedt
9ec1441a94 Added a comment 2014-02-28 17:56:42 +00:00
http://joeyh.name/
0a7d6df610 Added a comment 2014-02-28 17:52:07 +00:00
EskildHustvedt
d769d961eb 2014-02-28 08:50:56 +00:00
Hanno
e92b6050b3 Added a comment 2014-02-27 16:10:54 +00:00
Joey Hess
0824fbccbb Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-27 11:36:01 -04:00
Joey Hess
d856ae72a0 close 2014-02-27 11:35:57 -04:00
http://joeyh.name/
d872677e35 Added a comment 2014-02-27 15:35:29 +00:00
EskildHustvedt
205e2870cf Added a comment 2014-02-27 14:16:12 +00:00
philm
e296ef0087 2014-02-27 11:43:35 +00:00
http://joeyh.name/
2b39789e8b Added a comment 2014-02-26 18:52:18 +00:00
http://joeyh.name/
be6508aadd Added a comment 2014-02-26 18:34:18 +00:00
http://joeyh.name/
c26cb9fd9a Added a comment 2014-02-26 17:38:05 +00:00
fmarier
023ab19e5d Added a comment: Re: No working ubuntu package 2014-02-26 02:06:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlm_3m5gLhML9bHbZ8FpJ-HBZhWaRfFeO8
46b028d3cd Added a comment: I got this error too. 2014-02-25 17:23:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk
d201d7378c Added a comment: any ideas or questions? 2014-02-25 13:41:16 +00:00
EskildHustvedt
ccc1b6c04b 2014-02-25 00:09:47 +00:00
http://joeyh.name/
7790f7aa39 Added a comment 2014-02-24 23:39:47 +00:00
Joey Hess
50ded61c26 Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-24 18:22:22 -04:00
Joey Hess
d5a2b498f6 webdav: When built with DAV 0.6.0, use the new DAV monad to avoid locking files, which is not needed by git-annex's use of webdav, and does not work on Box.com. 2014-02-24 18:21:51 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI
2d9787a991 Added a comment: sounds good 2014-02-24 19:39:12 +00:00
http://joeyh.name/
df43ce926b Added a comment 2014-02-24 18:32:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkQafKy7hNSEolLs6TvbgUnkklTctUY9LI
d9b079ff4b 2014-02-24 17:54:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
5ad9a7c902 Added a comment 2014-02-24 13:20:28 +00:00
stp
e0c1cbdab7 Added a comment: Ídea 2014-02-23 14:25:23 +00:00
Joey Hess
39d7579f04 Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-21 18:34:58 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
9babfe70b7 Added a comment 2014-02-21 22:05:06 +00:00
Joey Hess
e834227202
move bug from forum and close 2014-02-21 13:43:20 -04:00
Joey Hess
ded4ab5704 Fix handling of rsync remote urls containing a username, including rsync.net. 
This breakage seems to have been caused way back in a1eded86,
but I am pretty sure rsync.net support has not been entirely
broken since last April. AFAICS, the generated .ssh/config
has not changed since then -- it has never included a Username setting
line. So, I am puzzled at when this reversion was introduced.

Note that the breakage only affected checkpresent and remove. Upload and
download use the ssh connection caching, which includes a -l username.
 2014-02-21 13:20:57 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
e23ab69e72 Added a comment 2014-02-21 07:03:23 +00:00
Joey Hess
d51d0a344f Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-20 18:48:10 -04:00
Joey Hess
b5b8425f40
fixed 2014-02-20 18:39:46 -04:00
stp
1f37922545 Added a comment: Some suggestions 2014-02-20 21:22:21 +00:00
stp
31b6cc569d Added a comment: Great improvements 2014-02-20 21:20:15 +00:00
stp
e8f6bf8820 Added a comment: Some ideas for content sync 2014-02-20 21:18:30 +00:00
Joey Hess
20bacee5e0 Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-20 16:30:06 -04:00
Joey Hess
760dfb3eda
close 2014-02-20 16:26:16 -04:00
http://joeyh.name/
594d7453e4 Added a comment 2014-02-20 20:26:06 +00:00
Joey Hess
e84e99061b close 2014-02-20 16:24:17 -04:00
Joey Hess
84657b591c
improve some webapp ui strings 2014-02-20 16:23:41 -04:00
http://joeyh.name/
84b198f5d4 Added a comment 2014-02-20 20:11:36 +00:00
http://joeyh.name/
dd37e6be3c Added a comment 2014-02-20 20:09:22 +00:00
Joey Hess
77676cea18 Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-20 16:08:15 -04:00
Joey Hess
c1521ab558
close 2014-02-20 16:07:52 -04:00
http://joeyh.name/
b35c903bd2 Added a comment 2014-02-20 19:49:21 +00:00
http://joeyh.name/
05c2165772 Added a comment 2014-02-20 19:34:29 +00:00
http://grossmeier.net/
7037872047 Added a comment 2014-02-20 19:31:56 +00:00
Joey Hess
21610294da trust, untrust, semitrust, dead: Warn when the trust level is overridden in .git/config. 2014-02-20 15:17:39 -04:00
Joey Hess
20c5bf8b41 Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-20 15:14:19 -04:00
http://joeyh.name/
0d8322a264 Added a comment 2014-02-20 18:59:45 +00:00
Joey Hess
e73364c4bd close 2014-02-20 14:51:44 -04:00
Joey Hess
f21889a9a3
update walkthrough 2014-02-20 14:48:09 -04:00
Joey Hess
134fdefb8c fsck: When run with --all or --unused, while .gitattributes annex.numcopies cannot be honored since it's operating on keys instead of files, make it honor the global numcopies setting, and the annex.numcopies git config setting. 2014-02-20 14:45:17 -04:00
Joey Hess
2845224884 close 2014-02-20 14:25:24 -04:00
http://joeyh.name/
e1c71981fe Added a comment: Could I get a "version", brethren? 2014-02-20 17:58:32 +00:00
http://grossmeier.net/
eddf388162 Added a comment: indirect vs direct 2014-02-20 06:25:32 +00:00
http://grossmeier.net/
cdb4a1e0a7 no sense in showing all those unused files 2014-02-20 06:22:35 +00:00
http://grossmeier.net/
70eb132846 rename forum/copy_unused_and_unused_not_agreeing.mdwn to bugs/copy_unused_and_unused_not_agreeing.mdwn 2014-02-20 06:13:21 +00:00
http://grossmeier.net/
5194b162fa 2014-02-19 18:16:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm3ayIrWKe5SqLYomXiCL-l2CDpREvA-IE
3a94295ed1 Added a comment: Seconding this Bug. 2014-02-19 02:04:34 +00:00
http://23.gs/
0e6173ab57 2014-02-18 23:59:16 +00:00
http://geoffreyirving.myopenid.com/
a345c74e8a Added a comment: encrypted home directory 2014-02-18 18:05:25 +00:00
http://geoffreyirving.myopenid.com/
1585480c37 2014-02-18 17:49:35 +00:00
stp
5c81fce77f 2014-02-17 23:27:05 +00:00
stp
b820820ba3 Added a comment: Earlier version syntax was removed 2014-02-17 16:05:34 +00:00
stp
30561e2f02 removed 2014-02-17 16:05:10 +00:00
stp
cda6566514 Added a comment: Earlier version syntax was removed 2014-02-17 16:01:16 +00:00
stp
035b6c8552 2014-02-17 15:56:56 +00:00
stp
d873483be6 2014-02-17 15:49:10 +00:00
stp
ee37c0b79a 2014-02-17 15:38:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
a28dda7e04 Added a comment: No working ubuntu package 2014-02-16 20:50:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
4ae5b698d0 2014-02-15 04:53:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
93192062d0 2014-02-15 04:52:12 +00:00
Joey Hess
9b71f0f047 Merge branch 'master' of ssh://git-annex.branchable.com 2014-02-14 17:02:52 -04:00
Joey Hess
fd09798e40 windows webapp: fix rsync.net support 2014-02-14 15:47:54 -04:00
https://openid.stackexchange.com/user/3f8a1927-744c-4409-8425-48fb3c86672f
6800c63461 Added a comment 2014-02-14 19:16:03 +00:00
Joey Hess
01b07a9ca6 update 2014-02-14 14:06:51 -04:00
Joey Hess
626829a061 forgot to close 2014-02-14 14:04:01 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
529604c643 Added a comment: Still problems 2014-02-14 11:30:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
9e065a3c23 Not yet fixed 
This reverts commit 1c6dc0521f
 2014-02-14 09:04:50 +00:00