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

4488 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
8810e57995 fix file name 2012-06-27 15:00:26 -04:00
Joey Hess
855eca0cc6 close 2012-06-27 13:38:21 -04:00
Joey Hess
abd36ed336 don't automerge when the symlinks cannot be parsed as keys 2012-06-27 13:35:02 -04:00
Joey Hess
048b64024a sync: Automatically resolves merge conflicts. 
untested, but it compiles :)
 2012-06-27 13:08:32 -04:00
Joey Hess
051c68041b properly handle deleted files when processing ls-files --unmerged 2012-06-27 12:11:03 -04:00
Joey Hess
8e8439a519 add ls-files --unmerged support 2012-06-27 09:27:59 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg
46c39888df Added a comment 2012-06-27 12:56:37 +00:00
http://joeyh.name/
48c0fd4bed Added a comment 2012-06-27 12:36:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE
38571d8133 Added a comment 2012-06-27 08:54:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
b356015cf4 2012-06-27 06:50:41 +00:00
http://joeyh.name/
f6f4b5dfaa Added a comment 2012-06-27 03:08:13 +00:00
Joey Hess
6f45827fe0 git-config fileEncoding 
Accept arbitrarily encoded repository filepaths etc when reading git config
output. This fixes support for remotes with unusual characters in their
names.

For example, a remote with a url of /tmp/çüş was previously
skipped, because the filename wasn't encoded right so it didn't think it
was available. And when setting the annex-uuid of a remote named "çüş",
it used to add it under a mis-encoded form of the remote's name. Both these
cases now work ok in my testing.
 2012-06-26 23:07:11 -04:00
Joey Hess
1093d82f6b Got rid of the last place that did utf8 decoding. 
Probably fixes bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/
although I don't know how to reproduce that bug.
 2012-06-26 22:58:44 -04:00
http://joeyh.name/
5faaf59368 Added a comment 2012-06-27 02:48:31 +00:00
Joey Hess
6e89513ca3 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-26 22:35:28 -04:00
Joey Hess
6aee7e5a8b Better fix for unavailable local remotes 
Not including such remotes turned out to have other consequences,
including annex-truselevel git config being ignored. Instead, add guards
before each operation that might try to operate on such a repo.
 2012-06-26 22:27:30 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg
06aeff9c7d 2012-06-27 00:33:04 +00:00
Joey Hess
1eff74dd44 blog for the day 2012-06-26 19:25:46 -04:00
Joey Hess
7e62e57f8c Avoid ugly failure mode when moving content from a local repository that is not available. 
Prelude.undefined error message was introduced by
bb4f31a0ee.

It seems best to filter out local repositories that cannot be accessed
from the list of remotes, rather than keeping them in and making every
thing that uses the list have to deal with remotes that may have an unknown
location.

Besides fixing the error message, this also makes unavailable local
remotes' names not be shown in various messages, including in git annex
status output.

Also, move --to an unavailable local repository now avoids some ugly
errors like "changeWorkingDirectory: does not exist".
 2012-06-26 17:22:44 -04:00
Joey Hess
a7b8c807d9 new bug I noticed 2012-06-26 12:37:04 -04:00
Joey Hess
41fcb3d852 Version build dependency on STM, and allow building without it, which disables the watch command. 2012-06-26 09:15:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670
6168795c1a 2012-06-26 08:32:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670
f72dd3e7e5 2012-06-26 08:31:48 +00:00
Joey Hess
336cee671e blog for the day 2012-06-25 20:40:58 -04:00
Joey Hess
17a8f60710 Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-25 20:17:54 -04:00
http://joeyh.name/
e3163bf416 Added a comment 2012-06-25 15:45:18 +00:00
http://joeyh.name/
61091915f6 Added a comment 2012-06-25 15:42:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
7e8a6e76b1 2012-06-25 15:38:57 +00:00
http://joeyh.name/
07c15d9a17 Added a comment 2012-06-25 15:38:44 +00:00
Joey Hess
cede7bdcde cabal: Only try to use inotify on Linux. 2012-06-25 11:38:42 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
0b04ff6431 2012-06-25 15:32:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
2e92f95edc 2012-06-25 15:30:00 +00:00
http://joeyh.name/
4884f18922 Added a comment 2012-06-25 15:29:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
fb415526e9 2012-06-25 13:37:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE
fa5c88b8f1 Added a comment: For the moment 2012-06-25 02:51:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE
7c754c8f66 Added a comment: Installation not working on OS X 10.6.8 2012-06-25 02:21:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkjvjLHW9Omza7x1VEzIFQ8Z5honhRB90I
4f04745c6b Added a comment: The fact that the keys changed causes merge conflicts 2012-06-25 00:29:02 +00:00
Joey Hess
38b3d8da1b typo 2012-06-24 17:51:08 -04:00
Joey Hess
fbc16360d5 add news item for git-annex 3.20120624 2012-06-24 12:51:36 -04:00
Joey Hess
a0952dd0f9 releasing version 3.20120624 2012-06-24 12:51:18 -04:00
http://joeyh.name/
d233537451 Added a comment 2012-06-23 14:30:22 +00:00
Joey Hess
325053e8de fixed 2012-06-23 10:27:04 -04:00
Joey Hess
af5e6156ba Merge branch 'master' of ssh://git-annex.branchable.com 2012-06-23 10:23:53 -04:00
Joey Hess
c79e3b67e9 sync: Avoid recent git's interactive merge. 2012-06-23 10:22:56 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
c6daf4e6c2 2012-06-23 07:24:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
f0617ece7c 2012-06-23 07:02:16 +00:00
Joey Hess
3118eeb63f update 2012-06-23 01:19:33 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlc1og3PqIGudOMkFNrCCNg66vB7s-jLpc
3606e94336 Added a comment: how is this different than rsync? 2012-06-22 22:10:22 +00:00
Joey Hess
264dd38c65 blog for the day 2012-06-22 17:17:41 -04:00
Joey Hess
153942cc6e update 2012-06-22 15:47:02 -04:00