summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* more descriptive name for oneshotGravatar Joey Hess2012-09-15
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-09-15
|\
* | bugfix: avoid staging but not committing changes to git-annex branchGravatar Joey Hess2012-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Branch.get is not able to see changes that have been staged to the index but not committed. This is a limitation of git cat-file --batch; when reading from the index, as opposed to from a branch, it does not notice changes made after the first time it reads the index. So, had to revert the changes made in 1f73db3469e29448bcb1520893de11b23da6fb1f to make annex.alwayscommit=false stage changes. Also, ensure that Branch.change and Branch.get always see changes at all points during a commit, by not deleting journal files when staging to the index. Delete them only after committing the branch. Before, there was a race during commits where a different git-annex could see out-of-date info from the branch while a commit was in progress. That's also done when updating the branch to merge in remote branches. In the case where the local git-annex branch has had changes pushed into it that are not yet reflected in the index, and there are journalled changes as well, a merge commit has to be done.
| * Added a commentGravatar http://joeyh.name/2012-09-16
| |
* | eliminate some commits to the git-annex branchGravatar Joey Hess2012-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commits used to be made to the git-annex branch whenever there were journalled changes from a previous command, and the current command looked up the value of a file. This no longer happens. This means that transferkey, which is a oneshot command that stages changes, can be run multiple times by the assistant, without each of them committing the changes made by the command before. Which will be a lot faster and use less space by batching up the commits. Commits still happen if a remote git-annex branch has been changed and is merged in.
* | Revert "add catFileIndex"Gravatar Joey Hess2012-09-15
| | | | | | | | | | This interface is not a good idea, because a running git cat-file --batch does not notice when existing files in the index are changed.
* | run git coprocesses with gitEnvGravatar Joey Hess2012-09-15
| |
* | add catFileIndexGravatar Joey Hess2012-09-15
| |
| * poll vote (Amazon S3)Gravatar 80.187.96.1362012-09-15
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo2012-09-15
| |
| * poll vote (My phone (or MP3 player))Gravatar 89.236.47.662012-09-15
| |
* | remove withIndexUpdate helperGravatar Joey Hess2012-09-15
| |
* | found some bugsGravatar Joey Hess2012-09-15
| |
| * Added a commentGravatar http://joeyh.name/2012-09-15
| |
| * poll vote (My phone (or MP3 player))Gravatar 128.61.104.522012-09-15
| |
| * poll vote (Amazon Glacier)Gravatar 87.79.135.2292012-09-15
| |
| * poll vote (My phone (or MP3 player))Gravatar 2001:980:45c4:1:a5a9:c33:f9a:2d052012-09-15
| |
| * (no commit message)Gravatar http://www.dbruhn.de/2012-09-15
| |
| * poll vote (My phone (or MP3 player))Gravatar 88.67.98.1822012-09-15
| |
| * poll vote (My phone (or MP3 player))Gravatar https://www.google.com/accounts/o8/id?id=AItOawmU_2tE75oyG0h2ZPN4lcroIKEMC8G-otE2012-09-15
| |
| * poll vote (Google Drive)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmU_2tE75oyG0h2ZPN4lcroIKEMC8G-otE2012-09-15
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo2012-09-15
| |
| * Added a comment: SparkleshareGravatar https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo2012-09-15
| |
| * poll vote (My phone (or MP3 player))Gravatar 37.14.174.1102012-09-15
| |
| * poll vote (My phone (or MP3 player))Gravatar 196.210.205.1762012-09-14
| |
| * poll vote (Amazon S3)Gravatar 216.203.6.112012-09-14
| |
| * poll vote (Amazon S3)Gravatar 82.36.235.92012-09-14
|/
* poll vote (Google Drive)Gravatar 85.84.130.122012-09-14
|
* poll vote (My phone (or MP3 player))Gravatar 142.103.22.672012-09-14
|
* poll vote (My phone (or MP3 player))Gravatar 194.167.235.2202012-09-14
|
* poll vote (Amazon S3)Gravatar 108.202.177.462012-09-14
|
* poll vote (My phone (or MP3 player))Gravatar 2001:8b0:641b:0:240:f4ff:fe51:2b8f2012-09-14
|
* poll vote (Amazon S3)Gravatar 61.16.175.582012-09-14
|
* poll vote (Amazon Glacier)Gravatar 81.110.190.382012-09-14
|
* poll vote (OpenStack SWIFT)Gravatar 134.34.1.2462012-09-14
|
* poll vote (My phone (or MP3 player))Gravatar 134.109.4.2102012-09-14
|
* poll vote (My phone (or MP3 player))Gravatar 134.93.131.802012-09-14
|
* poll vote (OpenStack SWIFT)Gravatar 80.138.120.932012-09-14
|
* poll vote (Amazon S3)Gravatar 204.210.141.902012-09-14
|
* poll vote (Google Drive)Gravatar 130.206.138.2332012-09-14
|
* poll vote (My phone (or MP3 player))Gravatar 195.81.3.2492012-09-14
|
* poll vote (My phone (or MP3 player))Gravatar 93.137.114.1362012-09-14
|
* poll vote (Google Drive)Gravatar 193.29.115.2502012-09-14
|
* poll vote (Box.com)Gravatar 193.29.115.2502012-09-14
|
* poll vote (My phone (or MP3 player))Gravatar 78.144.72.662012-09-14
|
* poll vote (Amazon Glacier)Gravatar 76.21.12.582012-09-14
|
* poll vote (My phone (or MP3 player))Gravatar 90.84.144.432012-09-14
|
* poll vote (Google Drive)Gravatar 189.103.67.262012-09-14
|
* poll vote (Amazon S3)Gravatar http://mike.magin.org/2012-09-14
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-09-14
|\
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 23:05:01 +0000