summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAge
* typoGravatar Joey Hess2011-12-14
|
* Added a commentGravatar http://joey.kitenet.net/2011-12-14
|
* (no commit message)Gravatar http://adamspiers.myopenid.com/2011-12-13
|
* add a link to git-union-mergeGravatar http://adamspiers.myopenid.com/2011-12-13
|
* Added a commentGravatar http://joey.kitenet.net/2011-12-13
|
* Added a commentGravatar http://www.joachim-breitner.de/2011-12-13
|
* Added a commentGravatar http://www.joachim-breitner.de/2011-12-13
|
* add news item for git-annex 3.20111211Gravatar Joey Hess2011-12-11
|
* detect and recover from branch push/commit raceGravatar Joey Hess2011-12-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dealing with a race without using locking is exceedingly difficult and tricky. Fully tested, I hope. There are three places left where the branch can be updated, that are not covered by the race recovery code. Let's prove they're all immune to the race: 1. tryFastForwardTo checks to see if a fast-forward can be done, and then does git-update-ref on the branch to fast-forward it. If a push comes in before the check, then either no fast-forward will be done (ok), or the push set the branch to a ref that can still be fast-forwarded (also ok) If a push comes in after the check, the git-update-ref will undo the ref change made by the push. It's as if the push did not come in, and the next git-push will see this, and try to re-do it. (acceptable) 2. When creating the branch for the very first time, an empty index is created, and a commit of it made to the branch. The commit's ref is recorded as the current state of the index. If a push came in during that, it will be noticed the next time a commit is made to the branch, since the branch will have changed. (ok) 3. Creating the branch from an existing remote branch involves making the branch, and then getting its ref, and recording that the index reflects that ref. If a push creates the branch first, git-branch will fail (ok). If the branch is created and a racing push is then able to change it (highly unlikely!) we're still ok, because it first records the ref into the index.lck, and then updating the index. The race can cause the index.lck to have the old branch ref, while the index has the newly pushed branch merged into it, but that only results in an unnecessary update of the index file later on.
* a new bug report to track a raceGravatar Joey Hess2011-12-11
|
* updateGravatar Joey Hess2011-12-11
|
* 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
|
* closeGravatar Joey Hess2011-12-11
|
* 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
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2011-12-10
|\
| * Added a commentGravatar http://www.joachim-breitner.de/2011-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.
| * Added a commentGravatar http://joey.kitenet.net/2011-12-09
| |
| * 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
|/
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU2011-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
|
* 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
|
* Added a commentGravatar 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
|
* added a branch for the new monad-control 0.3Gravatar Joey Hess2011-12-05
|
* respondGravatar Joey Hess2011-12-05
|
* fixed a long time agoGravatar Joey Hess2011-12-05
|
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 18:11:14 +0000