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

5472 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
0b12db64d8 Avoid crashing on encoding errors in filenames when writing transfer info files and reading from checksum commands. 2012-09-16 01:53:06 -04:00
Joey Hess
947b447626 close 2012-09-16 01:20:14 -04:00
Joey Hess
e028845487 close 2012-09-16 01:19:04 -04:00
Joey Hess
48fd1e629c reinject: When the provided file doesn't match, leave it where it is, rather than moving to .git/annex/bad/ 2012-09-16 01:17:48 -04:00
Joey Hess
719d229d9d Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-15 22:41:06 -04:00
Joey Hess
dd9e1f9831 blog for the day 2012-09-15 22:40:21 -04:00
Joey Hess
da63b7e96c Support repositories created with --separate-git-dir. Closes: #684405 2012-09-15 22:40:04 -04:00
188.61.52.255
d0d9eb1031 poll vote (Amazon Glacier) 2012-09-16 01:17:43 +00:00
188.61.52.255
a404ed33c3 poll vote (Tahoe-LAFS) 2012-09-16 01:17:34 +00:00
188.61.52.255
7e76544945 poll vote (Amazon Glacier) 2012-09-16 01:17:17 +00:00
Joey Hess
ba0334116c more descriptive name for oneshot 2012-09-15 20:46:38 -04:00
Joey Hess
9a9b4b840e Merge branch 'master' of ssh://git-annex.branchable.com 2012-09-15 20:17:03 -04:00
Joey Hess
750c4ac6c2 bugfix: avoid staging but not committing changes to git-annex branch 
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 1f73db3469
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.
 2012-09-15 20:15:16 -04:00
http://joeyh.name/
bd91c3f1fe Added a comment 2012-09-16 00:14:50 +00:00
Joey Hess
a1f93f06fd eliminate some commits to the git-annex branch 
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.
 2012-09-15 18:36:42 -04:00
Joey Hess
ca45cea113 Revert "add catFileIndex" 
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.
 2012-09-15 18:30:53 -04:00
Joey Hess
0b63ee6cd5 run git coprocesses with gitEnv 2012-09-15 17:43:37 -04:00
Joey Hess
e1baf48d88 add catFileIndex 2012-09-15 17:06:10 -04:00
80.187.96.136
816b9b4200 poll vote (Amazon S3) 2012-09-15 20:20:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo
74451f7155 2012-09-15 20:19:40 +00:00
89.236.47.66
83a1d4d496 poll vote (My phone (or MP3 player)) 2012-09-15 20:10:35 +00:00
Joey Hess
87fb9c690e remove withIndexUpdate helper 2012-09-15 15:48:21 -04:00
Joey Hess
b453ea8b48 found some bugs 2012-09-15 15:24:07 -04:00
http://joeyh.name/
2af34358b0 Added a comment 2012-09-15 16:39:19 +00:00
128.61.104.52
0b8fdca494 poll vote (My phone (or MP3 player)) 2012-09-15 15:03:16 +00:00
87.79.135.229
69bdc6207b poll vote (Amazon Glacier) 2012-09-15 13:01:56 +00:00
2001:980:45c4:1:a5a9:c33:f9a:2d05
1c054cd2e6 poll vote (My phone (or MP3 player)) 2012-09-15 12:41:35 +00:00
http://www.dbruhn.de/
1eca8d107e 2012-09-15 10:09:25 +00:00
88.67.98.182
e804d96a09 poll vote (My phone (or MP3 player)) 2012-09-15 09:40:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmU_2tE75oyG0h2ZPN4lcroIKEMC8G-otE
071a73212f poll vote (My phone (or MP3 player)) 2012-09-15 07:58:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmU_2tE75oyG0h2ZPN4lcroIKEMC8G-otE
3ffbd76267 poll vote (Google Drive) 2012-09-15 07:58:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo
2bff4ddf41 Added a comment 2012-09-15 01:35:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn4bbuawnh-nSo9pAh8irYAcV4MQCcfdHo
83b23844fd Added a comment: Sparkleshare 2012-09-15 01:28:05 +00:00
37.14.174.110
4360ce62b6 poll vote (My phone (or MP3 player)) 2012-09-15 00:33:20 +00:00
196.210.205.176
77db311489 poll vote (My phone (or MP3 player)) 2012-09-14 20:46:10 +00:00
216.203.6.11
3dea341433 poll vote (Amazon S3) 2012-09-14 20:09:53 +00:00
82.36.235.9
735d0300e3 poll vote (Amazon S3) 2012-09-14 19:42:19 +00:00
85.84.130.12
2fda03c46f poll vote (Google Drive) 2012-09-14 17:41:37 +00:00
142.103.22.67
69d474d7e2 poll vote (My phone (or MP3 player)) 2012-09-14 17:32:46 +00:00
194.167.235.220
e83052b916 poll vote (My phone (or MP3 player)) 2012-09-14 16:32:14 +00:00
108.202.177.46
2667e58eef poll vote (Amazon S3) 2012-09-14 14:37:32 +00:00
2001:8b0:641b:0:240:f4ff:fe51:2b8f
d3aee0b85e poll vote (My phone (or MP3 player)) 2012-09-14 13:44:19 +00:00
61.16.175.58
6e4ad78135 poll vote (Amazon S3) 2012-09-14 12:59:04 +00:00
81.110.190.38
b421a08d86 poll vote (Amazon Glacier) 2012-09-14 12:28:17 +00:00
134.34.1.246
afc5fb8291 poll vote (OpenStack SWIFT) 2012-09-14 11:20:52 +00:00
134.109.4.210
f76ab022f2 poll vote (My phone (or MP3 player)) 2012-09-14 10:40:26 +00:00
134.93.131.80
7f5b073e69 poll vote (My phone (or MP3 player)) 2012-09-14 09:03:42 +00:00
80.138.120.93
bfe58eee87 poll vote (OpenStack SWIFT) 2012-09-14 08:56:49 +00:00
204.210.141.90
ebcac59a07 poll vote (Amazon S3) 2012-09-14 08:06:55 +00:00
130.206.138.233
225c7d44e3 poll vote (Google Drive) 2012-09-14 08:06:02 +00:00