mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1
3223 commits 13 branches 445 tags 110 MiB
Commit graph

579 commits

Author SHA1 Message Date
Joey Hess
0609e10239 reopen 
People seem to want to post comments here with vague details about a new
bug, rather than opening a new bug report.
 2012-01-28 18:09:28 -04:00
Joey Hess
6e89064d27 fixed 2012-01-28 16:01:53 -04:00
http://joey.kitenet.net/
a75eff4a8e Added a comment 2012-01-28 19:40:34 +00:00
http://joey.kitenet.net/
2a6be431d4 Added a comment 2012-01-28 19:32:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk6QAwUsFHpr3Km1yQbg8hf3S7RDYf7hX4
141718da73 Added a comment 2012-01-28 00:21:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk6QAwUsFHpr3Km1yQbg8hf3S7RDYf7hX4
13e78fbf88 Added a comment 2012-01-28 00:17:38 +00:00
http://joey.kitenet.net/
0f8a8ef4a5 Added a comment 2012-01-27 21:00:06 +00:00
Joey Hess
0bb3a31a6e old version? 2012-01-27 16:50:27 -04:00
https://www.google.com/accounts/o8/id?id=AItOawk6QAwUsFHpr3Km1yQbg8hf3S7RDYf7hX4
ba6f01b137 2012-01-27 08:12:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk6QAwUsFHpr3Km1yQbg8hf3S7RDYf7hX4
9b91db8254 Added a comment 2012-01-26 22:13:19 +00:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
728d7e96e0 un-tangle unrelated posts 2012-01-15 20:48:26 +00:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
37d42ed1e7 rename bugs/__91__Installation__93___There_is_no_available_version_of_quickcheck_that_satisfies___62____61__2.1.mdwn to forum/__91__Installation__93___There_is_no_available_version_of_quickcheck_that_satisfies___62____61__2.1.mdwn 2012-01-15 19:20:29 +00:00
Joey Hess
ba6ca1bc23 no, really, I fixed it 2012-01-15 15:07:01 -04:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
14113f84b5 re-opened. proposed solution doesn't help. 2012-01-15 19:02:06 +00:00
Joey Hess
37b5b1bf0d Fix QuickCheck dependency in cabal file. 2012-01-15 13:53:51 -04:00
https://openid.stackexchange.com/user/fd55c6e3-966a-4626-865f-5d0f73e1eb88
072a3f2c99 2012-01-15 17:22:49 +00:00
Joey Hess
1ae780ee79 git-annex, git-union-merge: Support GIT_DIR and GIT_WORK_TREE. 
Note that GIT_WORK_TREE cannot influence GIT_DIR; that is necessary for
git-fake-bare and vcsh type things to work.
 2012-01-13 12:52:09 -04:00
Joey Hess
daff9029ba close 2012-01-13 12:09:02 -04:00
Joey Hess
9e2ab6f1aa add 2012-01-13 10:26:47 -04:00
Joey Hess
2051d80462 close 2012-01-05 23:42:06 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
3b450cb6bc Added a comment: Thank you! 2012-01-06 03:38:33 +00:00
http://joey.kitenet.net/
cdcf0aac71 Added a comment 2012-01-06 03:08:28 +00:00
http://joey.kitenet.net/
8858c24210 Added a comment 2012-01-06 03:04:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
2f2e0f7e0e 2012-01-06 01:41:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
79b95aae09 2012-01-06 01:40:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
9cb3303a27 2012-01-06 01:40:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
aedd4c1984 2012-01-06 01:31:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
17d8646164 2012-01-06 01:27:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
47d98bb446 2012-01-06 01:27:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkey8WuXUh_x5JC2c9_it1CYRnVTgdGu1M
ba0c3eb904 2012-01-06 01:25:08 +00:00
Joey Hess
7e6a54f984 Added quickcheck to build dependencies, and fail if test suite cannot be built. 2012-01-03 14:52:20 -04:00
http://peter-simons.myopenid.com/
390982414b Added a comment 2012-01-03 18:09:42 +00:00
http://joey.kitenet.net/
69875de8ea Added a comment 2012-01-03 16:54:19 +00:00
http://peter-simons.myopenid.com/
b6e7b44a12 2012-01-03 16:32:35 +00:00
http://a-or-b.myopenid.com/
17735698f6 Added a comment 2012-01-03 00:49:43 +00:00
http://joey.kitenet.net/
ddc4b3de33 Added a comment 2012-01-03 00:41:08 +00:00
http://joey.kitenet.net/
eec59e7362 Added a comment 2012-01-03 00:35:00 +00:00
http://a-or-b.myopenid.com/
3e678b1140 2012-01-03 00:10:45 +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://adamspiers.myopenid.com/
4eafd43cce Added a comment: Any update on this? 2011-12-24 01:05:08 +00: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
Joey Hess
f0f84dbe48 close 2011-12-19 14:31:33 -04: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/
3f01795a26 2011-12-18 11:59:11 +00:00
http://gebi.myopenid.com/
ec11908799 2011-12-16 00:13:54 +00: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