Commit graph

28102 commits

Author SHA1 Message Date
Joey Hess
eda5d9cc74
adjust: Add --fix adjustment, which is useful when the git directory is in a nonstandard place. 2016-05-16 17:18:33 -04:00
Joey Hess
76170b0457
add: Adding a v6 pointer file used to annex it; now the pointer file is added to git as-is.
(git add of a pointer file already did the right thing)
2016-05-16 15:30:40 -04:00
Joey Hess
4efc26ca6c
move keys db closure to AutoMerge
This makes git-annex sync also do it, which makes sure that the keys db
info is fresh when doing a sync --content.
2016-05-16 15:11:14 -04:00
Joey Hess
0860731760
reorder associated file db update
There's a potential race where the smudge filter is run at the same time an
object is being downloaded. If the download finished after the inAnnex
check, and before the keys db was updated, the associated file would not
get updated with the downloaded content.

I'm not sure this closes the race; it may only narrow the window. Problem
is, the keys database needs to communicate between two different processes.
In the case of the assistant, the transferkeys command is the other
process, and it closes the db handle after getting the file. So, it should
re-open the database and so see the update that the smudge filter has
written to it. But, what if the smudge filter takes a while to update the
database?
2016-05-16 14:55:05 -04:00
Joey Hess
9249af66f6
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-16 14:50:11 -04:00
Joey Hess
5f0b551c0c
assistant: Fix race in v6 mode that caused downloaded file content to sometimes not replace pointer files.
The keys database handle needs to be closed after merging, because the
smudge filter, in another process, updates the database. Old cached info
can be read for a while from the open database handle; closing it ensures
that the info written by the smudge filter is available.

This is pretty horribly ad-hoc, and it's especially nasty that the
transferrer closes the database every time.
2016-05-16 14:49:12 -04:00
Joey Hess
fb8ab2469d
assistant: Fix bug that caused v6 pointer files to be annexed by the assistant. 2016-05-16 13:36:36 -04:00
Joey Hess
c61f038fc9
stage pointer file not annex link 2016-05-16 13:19:02 -04:00
CandyAngel
789b6c062a Added a comment 2016-05-16 11:41:09 +00:00
midfield
e7e376f60e Added a comment: timings 2016-05-15 19:58:37 +00:00
openmedi
732cc8f6ca Added a comment 2016-05-14 13:24:06 +00:00
openmedi
7767d3c5ce Added a comment 2016-05-14 13:21:04 +00:00
drunken_sapo
45ef128fe6 Added a comment: The problem was path length 2016-05-14 13:11:36 +00:00
aslkdjasd@656d48eb766881455ee14c8cd4adabdd14aad892
4b870861b1 Added a comment: layout reasoning 2016-05-14 01:23:42 +00:00
thowz
e735938bbd Added a comment: adjusting symlink paths 2016-05-13 22:32:33 +00:00
drunken_sapo
2a0ca9cb75 Added a comment 2016-05-13 18:12:24 +00:00
Joey Hess
9f05be393e
adjust: If the adjusted branch already exists, avoid overwriting it, since it might contain changes that have not yet been propigated to the original branch.
Could not think of a foolproof way to detect if the old adjusted branch was
just behind the current branch. It's possible that the user amended the
adjusting commit at the head of the adjusted branch, for example.

I decided to bail in this situation, instead of just entering the old
branch, so that if git annex adjust succeeds the user is always in a
*current* adjusted branch, not some old and out of date one.

What could perhaps be done is enter the old branch and then update it. But
that seems too magical; the user may have rebased master or something or
may not want to propigate the changes from the old branch. Best to error
out.
2016-05-13 14:04:22 -04:00
Joey Hess
36cf163321
found a bad memory use in git 2016-05-12 17:26:33 -04:00
Joey Hess
0bbc6050f0
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-12 17:20:27 -04:00
Joey Hess
555a411cce
devblog 2016-05-12 17:19:55 -04:00
midfield
234f3ab1b5 Added a comment: v6 mode 2016-05-12 20:19:15 +00:00
midfield
811adffabd 2016-05-12 20:18:34 +00:00
Joey Hess
dd260706af
webapp: Avoid confusing display of dead remotes. 2016-05-12 16:12:16 -04:00
Joey Hess
a261a05c15
followup 2016-05-12 15:45:07 -04:00
Joey Hess
aa0bb64e6a
response 2016-05-12 15:31:40 -04:00
Joey Hess
d881850fe3
comment 2016-05-12 15:23:43 -04:00
Joey Hess
9fd09a657a
open bug from forum post 2016-05-12 15:14:30 -04:00
Joey Hess
8859065ecc
response 2016-05-12 15:11:28 -04:00
Joey Hess
844de6235b
response 2016-05-12 15:03:40 -04:00
Joey Hess
82c5223497
response 2016-05-12 14:46:48 -04:00
Joey Hess
0498d7388e
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-12 14:27:42 -04:00
Joey Hess
5cee93c4e5
link to my post "proposal for extending smudge/clean filters with raw file access" 2016-05-12 14:26:58 -04:00
openmedi
b21edb8d82 Added a comment 2016-05-12 07:49:33 +00:00
openmedi
eee9dafac8 Added a comment 2016-05-12 06:57:15 +00:00
openmedi
69a1afa5f0 Added a comment 2016-05-12 06:52:51 +00:00
midfield
e97ceaeaa6 2016-05-12 02:55:56 +00:00
paulK
34670bc816 2016-05-11 21:51:41 +00:00
annexuser
5d69c5f43b Added a comment 2016-05-11 20:32:55 +00:00
Joey Hess
1f38328d3c
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-11 16:09:56 -04:00
Joey Hess
7cacd7888b
Change git annex info remote encryption description to use wording closer to what's used in initremote. 2016-05-11 16:09:39 -04:00
Joey Hess
695fa2ea3e
clarify some things
In particular, specifying multiple keyid= in enableremote/initremote
doesn't work, and never has AFAICS, so don't suggest using it.

Also, there was some public/private key wording confusion.
2016-05-11 15:58:19 -04:00
midfield
4633f0b1d9 2016-05-11 17:31:41 +00:00
Joey Hess
2c1f223226
add news item for git-annex 6.20160511 2016-05-11 13:00:32 -04:00
Joey Hess
c6e30e2b9b
prep release 2016-05-11 12:41:58 -04:00
Joey Hess
92fcf990d3
Merge branch 'master' of ssh://git-annex.branchable.com 2016-05-11 12:37:54 -04:00
Joey Hess
6337a5466e
support SharedPubKeyCipher here 2016-05-11 12:37:13 -04:00
openmedi
7fe4c3b5f4 rename forum/__34__git_annex_assitant_--stop__34___doesn__39__t_work_in_OSX_10.11.4.mdwn to forum/__34__git_annex_assistant_--stop__34___doesn__39__t_work_in_OSX_10.11.4.mdwn 2016-05-11 13:06:33 +00:00
openmedi
2c5de4da2f 2016-05-11 13:05:59 +00:00
cmt.miniBill@1ee673129c276f72c8d7c2974091af7618a22c2a
aeacc4474f Fix typo 2016-05-11 07:14:25 +00:00
paulK
9c03a649c8 Bug report. 2016-05-11 00:52:34 +00:00