mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3055 commits 13 branches 443 tags 106 MiB
Commit graph

1697 commits

Author SHA1 Message Date
http://joey.kitenet.net/
0c107c98de Added a comment 2011-12-24 16:54:31 +00:00
http://joey.kitenet.net/
c87a814046 Added a comment 2011-12-24 16:49:13 +00:00
http://www.joachim-breitner.de/
ab1435310c Added a comment 2011-12-24 12:51:43 +00:00
http://www.joachim-breitner.de/
ffe9973ed5 Added a comment 2011-12-24 12:49:41 +00:00
http://www.openid.albertlash.com/openid/
ccddaf2f5c Added a comment 2011-12-24 06:08:46 +00:00
http://adamspiers.myopenid.com/
4eafd43cce Added a comment: Any update on this? 2011-12-24 01:05:08 +00:00
http://adamspiers.myopenid.com/
f78b0cb4e7 2011-12-24 00:48:37 +00:00
http://adamspiers.myopenid.com/
1202e605d7 2011-12-24 00:45:43 +00:00
http://adamspiers.myopenid.com/
010780dc55 add a page for openSUSE install instructions 2011-12-24 00:13:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmKPMUX0YHBjE93eBsEnacwZsddSDue3PY
4fb3114228 Added a comment 2011-12-23 22:04:09 +00:00
http://joey.kitenet.net/
56e4acfa24 Added a comment 2011-12-23 19:19:53 +00:00
http://adamspiers.myopenid.com/
bfa5509dbd Added a comment: Cool 2011-12-23 19:16:51 +00:00
http://joey.kitenet.net/
131d560ba6 Added a comment 2011-12-23 18:43:05 +00:00
http://joey.kitenet.net/
cbaf13e587 Added a comment 2011-12-23 18:02:24 +00:00
http://joey.kitenet.net/
d5889f8271 Added a comment 2011-12-23 17:52:21 +00:00
http://adamspiers.myopenid.com/
74e86b6da2 Added a comment 2011-12-23 17:24:59 +00:00
http://adamspiers.myopenid.com/
d3e80eabe8 Added a comment 2011-12-23 17:22:12 +00:00
http://adamspiers.myopenid.com/
fe65981de8 Added a comment 2011-12-23 17:14:03 +00:00
Joey Hess
3b1c80d795 fix 2011-12-23 12:58:39 -04:00
Joey Hess
6fcf76bcd1 slight simplification 2011-12-23 12:57:52 -04:00
Joey Hess
a0227e81f9 put in explicit fetch ; merge in walkthrough for now 
and link to centralized repository tutorial
 2011-12-23 12:55:11 -04:00
http://joey.kitenet.net/
304930f1fc Added a comment 2011-12-23 16:50:26 +00:00
Joey Hess
9e6ff9e734 improve wording to not imply a pull is done by merge 2011-12-23 12:49:28 -04:00
http://joey.kitenet.net/
0df51acc52 2011-12-23 16:20:43 +00:00
http://joey.kitenet.net/
e2b2c67f05 Added a comment 2011-12-23 16:16:19 +00:00
http://joey.kitenet.net/
538665f477 Added a comment 2011-12-23 16:07:39 +00:00
Joey Hess
8a2105c90a Merge branch 'master' of ssh://git-annex.branchable.com 2011-12-23 11:34:10 -04:00
http://adamspiers.myopenid.com/
abba5d3e82 Added a comment: I think Matt is right. 2011-12-23 14:04:46 +00:00
http://adamspiers.myopenid.com/
77ffd070ad Added a comment 2011-12-23 13:31:34 +00:00
Joey Hess
7227dd8f21 add escape_var hack 
Makes it easy to find files with duplicate contents, anyway.. :)
 2011-12-23 01:08:19 -04:00
Joey Hess
13a0c292b3 update example to actually work with new --format option 2011-12-23 01:08:19 -04:00
Joey Hess
eb7ef6264e fix 2011-12-23 01:08:18 -04:00
Joey Hess
a0872a8ec3 better data type 2011-12-22 19:56:31 -04:00
Joey Hess
06bafae9e0 Format strings can be specified using the new --find option, to control what is output by git annex find. 2011-12-22 18:31:44 -04:00
http://adamspiers.myopenid.com/
c02605919b Added a comment: How much memory would it actually use anyway? 2011-12-22 20:15:23 +00:00
http://adamspiers.myopenid.com/
38ad1065c9 Added a comment 2011-12-22 20:04:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlrnOT_XLcNNtmIwVdAJCJYu1BwAAOYtBI
2a7246864e 2011-12-22 19:33:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlrnOT_XLcNNtmIwVdAJCJYu1BwAAOYtBI
1071a3cf02 2011-12-22 19:21:50 +00:00
Joey Hess
6bffe509d7 Add --include, which is the same as --not --exclude. 2011-12-22 14:00:17 -04:00
http://joey.kitenet.net/
30cf6ce81c Added a comment 2011-12-22 16:39:24 +00:00
http://adamspiers.myopenid.com/
6808b08c1a Added a comment: Here's a Perl version 2011-12-22 15:43:52 +00:00
http://adamspiers.myopenid.com/
97bef4af73 Added a comment: List the duplicate filenames, then let the user decide what to do 2011-12-22 12:31:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
a99af6338e Added a comment 2011-12-21 16:06:26 +00:00
http://joey.kitenet.net/
a2e482b590 Added a comment: Good question! 2011-12-20 23:07:25 +00:00
Ian
58a89c243c 2011-12-20 22:36:03 +00:00
Joey Hess
1c28237e0c map: --fast disables use of dot to display map 
Generally useful, and allows the test suite to test it.
 2011-12-20 16:42:35 -04:00
http://joey.kitenet.net/
92de7c8dcd Added a comment 2011-12-20 14:56:12 +00:00
http://adamspiers.myopenid.com/
0de4341c97 Added a comment 2011-12-20 12:00:18 +00:00
http://www.joachim-breitner.de/
89fd3b2e4b Added a comment 2011-12-19 22:56:26 +00:00
Joey Hess
f0f84dbe48 close 2011-12-19 14:31:33 -04:00
http://joey.kitenet.net/
0b38397c6d Added a comment 2011-12-19 18:29:01 +00:00
http://joey.kitenet.net/
cddd521e1f Added a comment 2011-12-19 18:24:59 +00:00
http://joey.kitenet.net/
9b32d02a24 Added a comment 2011-12-19 18:22:25 +00:00
http://adamspiers.myopenid.com/
e341cdf0da Added a comment: extra level of indirection 2011-12-19 12:45:19 +00:00
http://www.joachim-breitner.de/
6a9b3c2f22 Added a comment 2011-12-18 13:57:34 +00:00
Joachim Breitner
0bba09cd5b fix syntax 2011-12-18 13:12:28 +01:00
Joachim Breitner
fa9d83f144 fix syntax 2011-12-18 13:11:41 +01:00
http://www.joachim-breitner.de/
a16f1accbc Added a comment 2011-12-18 12:08:52 +00:00
http://www.joachim-breitner.de/
3f01795a26 2011-12-18 11:59:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmKPMUX0YHBjE93eBsEnacwZsddSDue3PY
9698eecf0f 2011-12-18 09:35:40 +00:00
Joey Hess
9e82c348b7 Merge branch 'master' of ssh://git-annex.branchable.com 2011-12-16 14:21:28 -04:00
https://www.google.com/accounts/o8/id?id=AItOawm_-2XlXNyd6cCLI4n_jaBNqVUOWwJquko
a3e4bf8c16 2011-12-16 09:23:21 +00:00
http://gebi.myopenid.com/
ec11908799 2011-12-16 00:13:54 +00:00
Joey Hess
38b02de1a8 update 2011-12-15 15:21:03 -04:00
Joey Hess
2b24e16a63 typo 2011-12-14 13:32:13 -04:00
http://joey.kitenet.net/
25a5f6664e Added a comment 2011-12-14 17:31:31 +00:00
http://adamspiers.myopenid.com/
020c845058 2011-12-13 23:26:58 +00:00
http://adamspiers.myopenid.com/
c92d407efd add a link to git-union-merge 2011-12-13 22:01:13 +00:00
http://joey.kitenet.net/
490810ff9f Added a comment 2011-12-13 20:53:23 +00:00
http://www.joachim-breitner.de/
1a06455f5c Added a comment 2011-12-13 18:47:18 +00:00
http://www.joachim-breitner.de/
51b95fbc07 Added a comment 2011-12-13 18:16:09 +00:00
Joey Hess
d3d9c8a9a6 add news item for git-annex 3.20111211 2011-12-11 21:56:17 -04:00
Joey Hess
c4c965d602 detect and recover from branch push/commit race 
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.
 2011-12-11 20:41:35 -04:00
Joey Hess
81f311103d a new bug report to track a race 2011-12-11 16:41:56 -04:00
Joey Hess
0236bb020b update 2011-12-11 16:19:54 -04:00
Joey Hess
8680c415de slow, stupid, and safe index updating 
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.
 2011-12-11 15:05:53 -04:00
Joey Hess
59971c9230 new bug 2011-12-11 14:47:44 -04:00
Joey Hess
bf6a3b757a close 2011-12-11 01:15:27 -04:00
Joey Hess
10e8028a42 Fix bug in last version in getting contents from bare repositories. 2011-12-10 18:45:55 -04:00
http://schnouki.net/
bfdc9f28fc 2011-12-10 21:40:01 +00:00
http://joey.kitenet.net/
6cf28585b6 Added a comment 2011-12-10 19:43:04 +00:00
Joey Hess
d6fafc463e Merge branch 'master' of ssh://git-annex.branchable.com 2011-12-10 12:33:48 -04:00
http://www.joachim-breitner.de/
e0e9d1cabd Added a comment 2011-12-10 16:28:29 +00:00
Joey Hess
fb8231f3a1 sync: New command that synchronises the local repository and default remote, by running git commit, pull, and push for you. 2011-12-09 20:27:22 -04:00
http://joey.kitenet.net/
be67294a1e Added a comment 2011-12-09 22:56:11 +00:00
http://www.joachim-breitner.de/
2cd22c1a13 brr, so many typos today. 2011-12-09 21:25:37 +00:00
http://www.joachim-breitner.de/
07c32dd49c typo 2011-12-09 20:57:00 +00:00
http://www.joachim-breitner.de/
d69cf79e20 2011-12-09 20:47:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
e664af5d8c 2011-12-09 10:03:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
b3ac4af6b0 2011-12-08 22:50:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
e0e40964ab 2011-12-08 22:42:29 +00:00
Joey Hess
e3f1568e0f Fix caching of decrypted ciphers, which failed when drop had to check multiple different encrypted special remotes. 2011-12-08 16:01:46 -04:00
http://gebi.myopenid.com/
2568beee07 2011-12-08 14:24:08 +00:00
http://joey.kitenet.net/
2515bb6520 Added a comment 2011-12-07 20:54:51 +00:00
Joey Hess
d2ff311a34 change footer 2011-12-07 13:17:00 -04:00
Joey Hess
5926be6f30 response 2011-12-07 12:36:15 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU
c929f9df0f Added a comment 2011-12-07 07:39:16 +00:00
http://gebi.myopenid.com/
51b7b82870 2011-12-07 05:48:47 +00:00
http://gebi.myopenid.com/
919d58667a 2011-12-07 03:20:43 +00:00
http://gebi.myopenid.com/
ee26ebe6eb 2011-12-07 03:14:24 +00:00