summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Added a commentGravatar http://joeyh.name/2013-08-01
|
* Added a comment: checkpresent againGravatar https://www.google.com/accounts/o8/id?id=AItOawnWvnTWY6LrcPB4BzYEBn5mRTpNhg5EtEg2013-08-01
|
* blog for the dayGravatar Joey Hess2013-08-01
|
* Slow and ugly work around for bug #718517 in git, which broke git-cat-file ↵Gravatar Joey Hess2013-08-01
| | | | | | | | | | | | | --batch for filenames containing spaces. This runs git-cat-file in non-batch mode for all files with spaces. If a directory tree has a lot of them, and is in direct mode, even "git annex add" when there are few new files will need a *lot* of forks! The only reason buffering the whole file content to get the sha is not a memory leak is that git-annex only ever uses this on symlinks. This needs to be reverted as soon as a fix is available in git!
* updateGravatar Joey Hess2013-08-01
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-08-01
|\
* | Escape ':' in file/directory names to avoid it being treated as a pathspec ↵Gravatar Joey Hess2013-08-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by some git commands A git pathspec is a filename, except when it starts with ':', it's taken to refer to a branch, etc. Rather than special case ':', any filename starting with anything unusual is prefixed with "./" This could have been a real mess to deal with, but luckily SafeCommand is already extensively used and so we know at the type level the difference between parameters that are files, and parameters that are command options. Testing did show that Git.Queue was not using SafeCommand on filenames fed to xargs. (Filenames starting with '-' worked before only because -- was used to separate filenames from options when calling eg git add.) The test suite now passes with filenames starting with ':'. However, I did not keep that change to it, because such filenames are probably not legal on windows, and I have enough ugly windows ifdefs in there as it is. This commit was sponsored by Otavio Salvador. Thanks!
| * Added a commentGravatar http://joeyh.name/2013-08-01
| |
| * Added a comment: ThanksGravatar https://www.google.com/accounts/o8/id?id=AItOawln4uCaqZRd5_nRQ-iLcJyGctIdw8ebUiM2013-08-01
| |
| * Added a commentGravatar http://joeyh.name/2013-08-01
| |
| * Added a comment: Just put multiple source filesGravatar https://www.google.com/accounts/o8/id?id=AItOawln4uCaqZRd5_nRQ-iLcJyGctIdw8ebUiM2013-08-01
| |
| * Added a commentGravatar http://joeyh.name/2013-08-01
| |
| * Added a commentGravatar http://joeyh.name/2013-08-01
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-08-01
|\
* | improve importfeed --force; try to match existing files to avoid unncessary ↵Gravatar Joey Hess2013-08-01
| | | | | | | | duplication
| * Added a comment: --force reload all URLsGravatar ckeen2013-08-01
| |
| * Added a comment: Thank you so much!Gravatar https://launchpad.net/~mikapflueger2013-08-01
| |
| * TypoGravatar Richard Hartmann2013-08-01
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog2013-07-31
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawln4uCaqZRd5_nRQ-iLcJyGctIdw8ebUiM2013-07-31
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-07-31
|\
* | closeGravatar Joey Hess2013-07-31
| |
* | blog for the dayGravatar Joey Hess2013-07-31
| |
| * Added a commentGravatar http://joeyh.name/2013-07-31
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-07-31
|\
* | webapp: Improve handling of remotes whose setup has stalled.Gravatar Joey Hess2013-07-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes recovery from the ssh-agent problem that led to many reporting http://git-annex.branchable.com/bugs/Internal_Server_Error:_Unknown_UUID/ (Including fixing up .ssh/config to set IdentitiesOnly.) Remotes that have no known uuid are now displayed in the webapp as "unfinished". There's a link to check their status, and if the remote has been set annex-ignore, a retry button can be used to unset that and try again to set up the remote. As this bug has shown, the process of adding a ssh remote has some failure modes that are not really ideal. It would certianly be better if, when setting up a ssh remote it would detect if it's failed to get the UUID, and handle that in the remote setup process, rather than waiting until later and handling it this way. However, that's hard to do, particularly for local pairing, since the PairListener runs as a background thread. The best it could do is pop up an alert if there's a problem. This solution is not much different. Also, this solution handles cases where the user has gotten their repo into a mess manually and let's the assistant help with cleaning it up. This commit was sponsored by Chia Shee Liang. Thanks!
| * Added a commentGravatar http://joeyh.name/2013-07-31
| |
| * Added a comment: Horns?Gravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-07-31
| |
| * removedGravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-07-31
| |
| * Added a comment: Horns?Gravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-07-31
| |
| * Added a commentGravatar http://joeyh.name/2013-07-31
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnWvnTWY6LrcPB4BzYEBn5mRTpNhg5EtEg2013-07-31
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-07-31
|\
* | set IdentitiesOnlyGravatar Joey Hess2013-07-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting up a dedicated ssh key to access the annex on a host, set IdentitiesOnly to prevent the ssh-agent from forcing use of a different ssh key. That behavior could result in unncessary password prompts. I remember getting a message or two from people who got deluged with password prompts and I couldn't at the time see why. Also, it would prevent git-annex-shell from being run on the remote host, when git-annex was installed there by unpacking the standalone tarball, since the authorized_keys line for the dedicated ssh key, which sets up calling git-annex-shell when it's not in path, wouldn't be used. This fixes http://git-annex.branchable.com/bugs/Internal_Server_Error:_Unknown_UUID but I've not closed that bug yet since I should still: 1. Investigate why the ssh remote got set up despite being so broken. 2. Make the webapp not handle the NoUUID state in such an ugly way. 3. Possibly add code to fix up systems that encountered the problem. Although since it requires changes to .ssh/config this may be one for the release notes. Thanks to TJ for pointing me in the right direction to understand what was happening here.
| * Added a comment: workaroundGravatar http://joeyh.name/2013-07-31
| |
| * Added a comment: finally!Gravatar http://joeyh.name/2013-07-31
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-07-31
|\
* | make edits that a commenter apparently didn't realize they could make. this ↵Gravatar Joey Hess2013-07-31
| | | | | | | | is a wiki..
| * Added a commentGravatar http://joeyh.name/2013-07-31
| |
| * Added a commentGravatar http://joeyh.name/2013-07-31
| |
* | typoGravatar Joey Hess2013-07-31
| |
| * Added a comment: use the forceGravatar http://joeyh.name/2013-07-31
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-07-31
|\
* | importfeed --force: re-download urls that have been seen beforeGravatar Joey Hess2013-07-31
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog2013-07-31
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnRai_qFYPVvEgC6i1nlM1bh-C__jbhqS02013-07-31
| |
| * Added a commentGravatar Remy2013-07-31
| |
| * Added a comment: checkpresent success and failureGravatar https://www.google.com/accounts/o8/id?id=AItOawnWvnTWY6LrcPB4BzYEBn5mRTpNhg5EtEg2013-07-31
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmicVKRM8vJX4wPuAwlLEoS2cjmFXQkjkE2013-07-31
| |
| * Added a comment: Please be more specific about what information goes into ↵Gravatar https://www.google.com/accounts/o8/id?id=AItOawmicVKRM8vJX4wPuAwlLEoS2cjmFXQkjkE2013-07-31
| | | | | | | | the key