Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Added a comment | http://joey.kitenet.net/ | 2011-12-23 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2011-12-23 |
|\ | |||
| * | Added a comment: I think Matt is right. | http://adamspiers.myopenid.com/ | 2011-12-23 |
| | | |||
| * | Added a comment | http://adamspiers.myopenid.com/ | 2011-12-23 |
| | | |||
* | | add escape_var hack | Joey Hess | 2011-12-23 |
| | | | | | | | | Makes it easy to find files with duplicate contents, anyway.. :) | ||
* | | update example to actually work with new --format option | Joey Hess | 2011-12-23 |
| | | |||
* | | fix | Joey Hess | 2011-12-23 |
| | | |||
* | | better data type | Joey Hess | 2011-12-22 |
| | | |||
* | | Format strings can be specified using the new --find option, to control what ↵ | Joey Hess | 2011-12-22 |
| | | | | | | | | is output by git annex find. | ||
| * | Added a comment: How much memory would it actually use anyway? | http://adamspiers.myopenid.com/ | 2011-12-22 |
| | | |||
| * | Added a comment | http://adamspiers.myopenid.com/ | 2011-12-22 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawlrnOT_XLcNNtmIwVdAJCJYu1BwAAOYtBI | 2011-12-22 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawlrnOT_XLcNNtmIwVdAJCJYu1BwAAOYtBI | 2011-12-22 |
| | | |||
* | | Add --include, which is the same as --not --exclude. | Joey Hess | 2011-12-22 |
|/ | |||
* | Added a comment | http://joey.kitenet.net/ | 2011-12-22 |
| | |||
* | Added a comment: Here's a Perl version | http://adamspiers.myopenid.com/ | 2011-12-22 |
| | |||
* | Added a comment: List the duplicate filenames, then let the user decide what ↵ | http://adamspiers.myopenid.com/ | 2011-12-22 |
| | | | | to do | ||
* | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU | 2011-12-21 |
| | |||
* | Added a comment: Good question! | http://joey.kitenet.net/ | 2011-12-20 |
| | |||
* | (no commit message) | Ian | 2011-12-20 |
| | |||
* | map: --fast disables use of dot to display map | Joey Hess | 2011-12-20 |
| | | | | Generally useful, and allows the test suite to test it. | ||
* | Added a comment | http://joey.kitenet.net/ | 2011-12-20 |
| | |||
* | Added a comment | http://adamspiers.myopenid.com/ | 2011-12-20 |
| | |||
* | Added a comment | http://www.joachim-breitner.de/ | 2011-12-19 |
| | |||
* | close | Joey Hess | 2011-12-19 |
| | |||
* | Added a comment | http://joey.kitenet.net/ | 2011-12-19 |
| | |||
* | Added a comment | http://joey.kitenet.net/ | 2011-12-19 |
| | |||
* | Added a comment | http://joey.kitenet.net/ | 2011-12-19 |
| | |||
* | Added a comment: extra level of indirection | http://adamspiers.myopenid.com/ | 2011-12-19 |
| | |||
* | Added a comment | http://www.joachim-breitner.de/ | 2011-12-18 |
| | |||
* | fix syntax | Joachim Breitner | 2011-12-18 |
| | |||
* | fix syntax | Joachim Breitner | 2011-12-18 |
| | |||
* | Added a comment | http://www.joachim-breitner.de/ | 2011-12-18 |
| | |||
* | (no commit message) | http://www.joachim-breitner.de/ | 2011-12-18 |
| | |||
* | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawmKPMUX0YHBjE93eBsEnacwZsddSDue3PY | 2011-12-18 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2011-12-16 |
|\ | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawm_-2XlXNyd6cCLI4n_jaBNqVUOWwJquko | 2011-12-16 |
| | | |||
| * | (no commit message) | http://gebi.myopenid.com/ | 2011-12-16 |
| | | |||
* | | update | Joey Hess | 2011-12-15 |
|/ | |||
* | typo | Joey Hess | 2011-12-14 |
| | |||
* | Added a comment | http://joey.kitenet.net/ | 2011-12-14 |
| | |||
* | (no commit message) | http://adamspiers.myopenid.com/ | 2011-12-13 |
| | |||
* | add a link to git-union-merge | http://adamspiers.myopenid.com/ | 2011-12-13 |
| | |||
* | Added a comment | http://joey.kitenet.net/ | 2011-12-13 |
| | |||
* | Added a comment | http://www.joachim-breitner.de/ | 2011-12-13 |
| | |||
* | Added a comment | http://www.joachim-breitner.de/ | 2011-12-13 |
| | |||
* | add news item for git-annex 3.20111211 | Joey Hess | 2011-12-11 |
| | |||
* | detect and recover from branch push/commit race | Joey Hess | 2011-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 race | Joey Hess | 2011-12-11 |
| | |||
* | update | Joey Hess | 2011-12-11 |
| |