summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* responseGravatar Joey Hess2016-05-17
|
* followupGravatar Joey Hess2016-05-17
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-05-17
|\
* | Fix crash when entering/changing view in a subdirectory of a repo that has a ↵Gravatar Joey Hess2016-05-17
| | | | | | | | dotfile in its root.
* | use indexEnvGravatar Joey Hess2016-05-17
| |
* | Work around git bug in handling of relative path to GIT_INDEX_FILE when in a ↵Gravatar Joey Hess2016-05-17
| | | | | | | | | | | | | | | | subdirectory of the repository. This affected git annex view. It turns out that some other places that use GIT_INDEX_FILE were already working around the bug. I removed the workaround from Annex.Branch since the new workaround will do.
| * (no commit message)Gravatar Gus2016-05-17
| |
| * (no commit message)Gravatar adament@c0981cf9fb3a2c013811bae9af9bada8f0fa08862016-05-17
| |
| * (no commit message)Gravatar adament@c0981cf9fb3a2c013811bae9af9bada8f0fa08862016-05-17
| |
| * Added a comment: RestartingGravatar Gus2016-05-17
| |
| * Added a commentGravatar openmedi2016-05-16
|/
* commentGravatar Joey Hess2016-05-16
|
* commentGravatar Joey Hess2016-05-16
|
* avoid checking locations in regular repoGravatar Joey Hess2016-05-16
| | | | | | In commit 07b1aa343b6d82e8f75de606a5647b0a789f76e0 I accidentially made gitAnnexLocation do more work, checking content locations, when used in a regular repo.
* adjust: Add --fix adjustment, which is useful when the git directory is in a ↵Gravatar Joey Hess2016-05-16
| | | | nonstandard place.
* add: Adding a v6 pointer file used to annex it; now the pointer file is ↵Gravatar Joey Hess2016-05-16
| | | | | | added to git as-is. (git add of a pointer file already did the right thing)
* move keys db closure to AutoMergeGravatar Joey Hess2016-05-16
| | | | | This makes git-annex sync also do it, which makes sure that the keys db info is fresh when doing a sync --content.
* reorder associated file db updateGravatar Joey Hess2016-05-16
| | | | | | | | | | | | | | | 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?
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-05-16
|\
* | assistant: Fix race in v6 mode that caused downloaded file content to ↵Gravatar Joey Hess2016-05-16
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | assistant: Fix bug that caused v6 pointer files to be annexed by the assistant.Gravatar Joey Hess2016-05-16
| |
* | stage pointer file not annex linkGravatar Joey Hess2016-05-16
| |
| * Added a commentGravatar CandyAngel2016-05-16
| |
| * Added a comment: timingsGravatar midfield2016-05-15
| |
| * Added a commentGravatar openmedi2016-05-14
| |
| * Added a commentGravatar openmedi2016-05-14
| |
| * Added a comment: The problem was path lengthGravatar drunken_sapo2016-05-14
| |
| * Added a comment: layout reasoningGravatar aslkdjasd@656d48eb766881455ee14c8cd4adabdd14aad8922016-05-14
| |
| * Added a comment: adjusting symlink pathsGravatar thowz2016-05-13
| |
| * Added a commentGravatar drunken_sapo2016-05-13
|/
* adjust: If the adjusted branch already exists, avoid overwriting it, since ↵Gravatar Joey Hess2016-05-13
| | | | | | | | | | | | | | | | | 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.
* found a bad memory use in gitGravatar Joey Hess2016-05-12
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-05-12
|\
* | devblogGravatar Joey Hess2016-05-12
| |
| * Added a comment: v6 modeGravatar midfield2016-05-12
| |
| * (no commit message)Gravatar midfield2016-05-12
|/
* webapp: Avoid confusing display of dead remotes.Gravatar Joey Hess2016-05-12
|
* followupGravatar Joey Hess2016-05-12
|
* responseGravatar Joey Hess2016-05-12
|
* commentGravatar Joey Hess2016-05-12
|
* open bug from forum postGravatar Joey Hess2016-05-12
|
* responseGravatar Joey Hess2016-05-12
|
* responseGravatar Joey Hess2016-05-12
|
* responseGravatar Joey Hess2016-05-12
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-05-12
|\
* | link to my post "proposal for extending smudge/clean filters with raw file ↵Gravatar Joey Hess2016-05-12
| | | | | | | | access"
| * Added a commentGravatar openmedi2016-05-12
| |
| * Added a commentGravatar openmedi2016-05-12
| |
| * Added a commentGravatar openmedi2016-05-12
| |
| * (no commit message)Gravatar midfield2016-05-12
| |