summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* pin crytonite on android to 0.15, which is the version I've been usingGravatar Joey Hess2016-06-09
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-06-09
|\
* | noteGravatar Joey Hess2016-06-09
| |
* | highlight v6 changesGravatar Joey Hess2016-06-09
| |
* | Make git clean filter preserve the backend that was used for a file.Gravatar Joey Hess2016-06-09
| |
* | closeGravatar Joey Hess2016-06-09
| |
* | Fix update of associated files db when unlocking a file in a v6 repo.Gravatar Joey Hess2016-06-09
| |
* | Make lock and unlock work in v6 repos on files whose content is not present.Gravatar Joey Hess2016-06-09
| |
* | Fix bug in initialization of clone from a repo with an adjusted branch that ↵Gravatar Joey Hess2016-06-09
| | | | | | | | | | | | | | | | | | had not been synced back to master. This bug caused broken tree objects to get built by a later git annex sync. This is a somewhat unlikely but not impossible situation, and the test suite's union_merge_regression test tickled it when it was run on FAT.
| * (no commit message)Gravatar openmedi2016-06-08
|/
* also avoid crashing in most circumstances if unable to determine the usernameGravatar Joey Hess2016-06-08
| | | | | | | | Mostly the username is only used for the git committer or other display purposes, and we can just fall back to a dummy value in these cases. The only remaining place where an error is thrown is when starting local pairing, which needs the username to be known.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-06-08
|\
| * Added a comment: Still seeing thisGravatar jgoerzen2016-06-08
| |
* | Avoid a crash if getpwuid does not work, when querying the user's full name.Gravatar Joey Hess2016-06-08
|/
* remove spamGravatar Joey Hess2016-06-08
|
* devblogGravatar Joey Hess2016-06-07
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-06-07
|\
* | Fix bad automatic merge conflict resolution between an annexed file and a ↵Gravatar Joey Hess2016-06-07
| | | | | | | | | | | | | | directory with the same name when in an adjusted branch. When running in an overlay work tree, all unchanged files show as deleted, so this code that stages deletions should not run.
| * (no commit message)Gravatar ivan.iossifov@2673267f2e818d14a75f506d41738323cbc0bd042016-06-07
| |
| * Added a commentGravatar chris@f4ea67aa5ae4709d79959f782fcebb5edae9a79b2016-06-07
| |
| * (no commit message)Gravatar freewheelinfranks@f936f2e420801f565d39e40036c0a22c71a794252016-06-07
| |
| * Added a comment: SOLVEDGravatar juh2016-06-06
| |
| * Added a comment: Coment 5Gravatar Roksolana2016-06-06
| |
| * removedGravatar Roksolana2016-06-06
| |
| * Added a comment: Long Path ToolGravatar Roksolana2016-06-06
| |
| * Added a comment: I think I have figured out somethingGravatar Gus2016-06-05
| |
* | move --to: Better behavior when system is completely out of disk space; drop ↵Gravatar Joey Hess2016-06-05
| | | | | | | | | | | | | | | | content from disk before writing location log. I noticed move --to failing when there was no disk space. The file was sent to the remote, but it crashed before it could be dropped locally. This could fix that.
| * Added a commentGravatar xloem2016-06-05
| |
| * (no commit message)Gravatar xloem2016-06-05
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-06-04
|\
* | list: Do not include dead repositories.Gravatar Joey Hess2016-06-04
| |
| * (no commit message)Gravatar juh2016-06-04
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-06-03
|\|
| * Added a comment: A more detailed walkthroughGravatar matei.david@d6acba23dba331f26fc4756d01c7ab65cf3aee4d2016-06-03
| |
* | withAltRepo needs a separate queue of changesGravatar Joey Hess2016-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The queue could potentially contain changes from before withAltRepo, and get flushed inside the call, which would apply the changes to the modified repo. Or, changes could be queued in withAltRepo that were intended to affect the modified repo, but don't get flushed until later. I don't know of any cases where either happens, but better safe than sorry. Note that this affect withIndexFile, which is used in git-annex branch updates. So, it potentially makes things slower. Should not be by much; the overhead consists only of querying the current queue a couple of times, and potentially flushing changes queued within withAltRepo earlier, that could have maybe been bundled with other later changes. Notice in particular that the existing queue is not flushed when calling withAltRepo. So eg when git annex add needs to stage files in the index, it will still bundle them together efficiently.
* | better failure diagnosisGravatar Joey Hess2016-06-03
| |
* | Revert "removed"Gravatar Joey Hess2016-06-02
|/ | | | This reverts commit d9228740cf77624b5a74d04c07451f4ba5c79453.
* removedGravatar Fheedah666@a521babeb96f01d88b722c185e5bb8cac2f9e9462016-06-03
|
* devblogGravatar Joey Hess2016-06-02
|
* Fix initialization of a bare clone of a repo that has an adjusted branch ↵Gravatar Joey Hess2016-06-02
| | | | checked out.
* refactor isBareRepoGravatar Joey Hess2016-06-02
|
* fix man page buildingGravatar Joey Hess2016-06-02
|
* make LocalRepo a newtypeGravatar Joey Hess2016-06-02
|
* remotedaemon: Fixed support for notifications of changes to gcrypt remotes, ↵Gravatar Joey Hess2016-06-02
| | | | which was never tested and didn't quite work before.
* better avoid switching to direct mode in clone of adjusted branch repoGravatar Joey Hess2016-06-02
|
* fix git versionGravatar Joey Hess2016-06-02
|
* avoid switching to direct mode in clone of adjusted branch repoGravatar Joey Hess2016-06-02
|
* Automatically enable v6 mode when initializing in a clone from a repo that ↵Gravatar Joey Hess2016-06-02
| | | | | | | has an adjusted branch checked out. The clone also has the adjusted branch checked out, so it needs to be initialized to a version that supports that.
* Pass -S to git commit-tree when commit.gpgsign is set and when making a ↵Gravatar Joey Hess2016-06-02
| | | | non-automatic commit, in order to preserve current behavior when used with git 1.9, which has stopped doing this itself.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-06-02
|\
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-19 04:22:09 +0000