summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* slow, stupid, and safe index updatingGravatar Joey Hess2011-12-11
| | | | | | | | | | | | | | | | | | Always merge the git-annex branch into .git/annex/index before making a commit from the index. This ensures that, when the branch has been changed in any way (by a push being received, or changes pulled directly into it, or even by the user checking it out, and committing a change), the index reflects those changes. This is much too slow; it needs to be optimised to only update the index when the branch has really changed, not every time. Also, there is an unhandled race, when a change is made to the branch right after the index gets updated. I left it in for now because it's unlikely and I didn't want to complicate things with additional locking yet.
* new bugGravatar Joey Hess2011-12-11
|
* move a file location to Locations.hsGravatar Joey Hess2011-12-11
|
* closeGravatar Joey Hess2011-12-11
|
* better syntaxGravatar Joey Hess2011-12-10
|
* ensure local remote is initialized when copying to itGravatar Joey Hess2011-12-10
| | | | | | | | | | | | | | | | | Needed due to this scenario: Bare repo origin is made, foo is cloned from it; foo is initalized; a file is added to foo's annex; git annex move --to origin Since the git-annex branch has not yet been pushed to origin, it doesn't auto-initialize. When the content is sent to it, it's stored, but the remote has NoUUID, and so nothing is logged in the location log. Then the content is removed from the local repo, and git-annex has lost track of it. git annex fsck in origin will find the lost content, but let's not let this happen. Content should only be sent to initalized remotes. This cannot happen for non-local remotes, since git-annex-shell always checks that the repo is initialized.
* updateGravatar Joey Hess2011-12-10
|
* Fix bug in last version in getting contents from bare repositories.Gravatar Joey Hess2011-12-10
|
* (no commit message)Gravatar http://schnouki.net/2011-12-10
|
* Added a commentGravatar http://joey.kitenet.net/2011-12-10
|
* version dependency on old monad-controlGravatar Joey Hess2011-12-10
| | | | This should let cabal build it with the right version.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2011-12-10
|\
* | no need to show, it's a stringGravatar Joey Hess2011-12-10
| |
| * Added a commentGravatar http://www.joachim-breitner.de/2011-12-10
| |
* | separate operationsGravatar Joey Hess2011-12-10
| |
* | sync: New command that synchronises the local repository and default remote, ↵Gravatar Joey Hess2011-12-09
| | | | | | | | by running git commit, pull, and push for you.
* | avoid some readGravatar Joey Hess2011-12-09
| |
| * Added a commentGravatar http://joey.kitenet.net/2011-12-09
| |
* | some work on avoiding partial functionsGravatar Joey Hess2011-12-09
| | | | | | | | | | There are still hundreds of places that use partial functions head, tail, init, and last.
| * brr, so many typos today.Gravatar http://www.joachim-breitner.de/2011-12-09
| |
| * typoGravatar http://www.joachim-breitner.de/2011-12-09
| |
| * (no commit message)Gravatar http://www.joachim-breitner.de/2011-12-09
|/
* inverted logicGravatar Joey Hess2011-12-09
|
* cleanupGravatar Joey Hess2011-12-09
|
* Merge remote-tracking branch 'origin/master'Gravatar Joey Hess2011-12-09
|\
* | unannex improvementsGravatar Joey Hess2011-12-09
| | | | | | | | | | | | | | | | | | Added files don't have to be committed before they can be unannexed. unannex no longer commits existing staged changes unannex of the last file in a directory now works, before it failed because git rm deleted the directory out from under it,
* | factor out a stopUnlessGravatar Joey Hess2011-12-09
| | | | | | | | code melt for lunch
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU2011-12-09
| |
* | hslintGravatar Joey Hess2011-12-09
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU2011-12-08
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU2011-12-08
|/
* Fix caching of decrypted ciphers, which failed when drop had to check ↵Gravatar Joey Hess2011-12-08
| | | | multiple different encrypted special remotes.
* (no commit message)Gravatar http://gebi.myopenid.com/2011-12-08
|
* Added a commentGravatar http://joey.kitenet.net/2011-12-07
|
* add: If interrupted, add can leave files converted to symlinks but not yet ↵Gravatar Joey Hess2011-12-07
| | | | added to git. Running the add again will now clean up this situtation.
* change footerGravatar Joey Hess2011-12-07
|
* responseGravatar Joey Hess2011-12-07
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU2011-12-07
|
* (no commit message)Gravatar http://gebi.myopenid.com/2011-12-07
|
* (no commit message)Gravatar http://gebi.myopenid.com/2011-12-07
|
* (no commit message)Gravatar http://gebi.myopenid.com/2011-12-07
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU2011-12-06
|
* responseGravatar Joey Hess2011-12-06
|
* (no commit message)Gravatar http://gebi.myopenid.com/2011-12-06
|
* Added a commentGravatar http://joey.kitenet.net/2011-12-06
|
* Prevent key names from containing newlines.Gravatar Joey Hess2011-12-06
| | | | | | | | | There are several places where it's assumed a key can be written on one line. One is in the format of the .git/annex/unused files. The difficult one is that filenames derived from keys are fed into git cat-file --batch, which has a line based input. (And no -z option.) So, for now it's best to block such keys being created.
* Added a commentGravatar http://joey.kitenet.net/2011-12-06
|
* Added a commentGravatar http://joey.kitenet.net/2011-12-06
|
* Gravatar https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU2011-12-06
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU2011-12-06
|