Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | work around lack of receive.denyCurrentBranch in direct mode | Joey Hess | 2013-11-05 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that direct mode sets core.bare=true, git's normal prohibition about pushing into the currently checked out branch doesn't work. A simple fix for this would be an update hook which blocks the pushes.. but git hooks must be executable, and git-annex needs to be usable on eg, FAT, which lacks x bits. Instead, enabling direct mode switches the branch (eg master) to a special purpose branch (eg annex/direct/master). This branch is not pushed when syncing; instead any changes that git annex sync commits get written to master, and it's pushed (along with synced/master) to the remote. Note that initialization has been changed to always call setDirect, even if it's just setDirect False for indirect mode. This is needed because if the user has just cloned a direct mode repo, that nothing has synced with before, it may have no master branch, and only a annex/direct/master. Resulting in that branch being checked out locally too. Calling setDirect False for indirect mode moves back out of this branch, to a new master branch, and ensures that a manual "git push" doesn't push changes directly to the annex/direct/master of the remote. (It's possible that the user makes a commit w/o using git-annex and pushes it, but nothing I can do about that really.) This commit was sponsored by Jonathan Harrington. | ||
* | factor out update | Joey Hess | 2013-11-05 |
| | |||
* | v5 for direct mode, with automatic upgrade | Joey Hess | 2013-11-05 |
| | | | | | This includes storing the current state of the HEAD ref, which git annex sync is going to need, but does not make sync use it. | ||
* | automatically set and unset core.bare when switching to/from direct mode | Joey Hess | 2013-11-05 |
| | |||
* | refactored hook setup | Joey Hess | 2013-11-05 |
| | |||
* | support direct mode repositories with core.bare=true (not yet default) | Joey Hess | 2013-11-05 |
| | | | | | | | | | | | Direct mode repositories can now have core.bare=true set, to prevent accidentally running git commands that try to operate on the work tree, and so do the wrong thing. This is not yet the default, and it causes known problems for git-annex sync due to receive.denyCurrentBranch not working in bare repositories. This commit was sponsored by Richard Hartmann. | ||
* | pass -c option on to all git commands run | Joey Hess | 2013-11-05 |
| | | | | | | | | The -c option now not only modifies the git configuration seen by git-annex, but it is passed along to every git command git-annex runs. This was easy to plumb through because gitCommandLine is already used to construct every git command line, to add --git-dir and --work-tree | ||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-11-05 |
|\ | |||
* | | fixed long ago | Joey Hess | 2013-11-05 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-11-05 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-11-05 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-11-05 |
| | | |||
* | | dup | Joey Hess | 2013-11-05 |
|/ | |||
* | Added a comment: awesome! | https://id.koumbit.net/anarcat | 2013-11-05 |
| | |||
* | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw | 2013-11-05 |
| | |||
* | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU | 2013-11-05 |
| | |||
* | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU | 2013-11-05 |
| | |||
* | pubdate should be added to importfeed's templating. | https://www.google.com/accounts/o8/id?id=AItOawkwQdSwD0JLNQHcQoUVLT-ZwaRKq-b0om8 | 2013-11-05 |
| | |||
* | hmm... maybe related to another SNAFU bug i filed... | https://id.koumbit.net/anarcat | 2013-11-05 |
| | |||
* | just followed the "file a bug" link in the webapp here :) | https://id.koumbit.net/anarcat | 2013-11-05 |
| | |||
* | (no commit message) | tanen | 2013-11-04 |
| | |||
* | (no commit message) | tanen | 2013-11-04 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-11-04 |
|\ | |||
* | | devblog | Joey Hess | 2013-11-04 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio | 2013-11-04 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio | 2013-11-04 |
| | | |||
| * | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio | 2013-11-04 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-11-04 |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-11-04 |
|\ | |||
* | | improvements; recommend sync after copy | Joey Hess | 2013-11-04 |
| | | |||
| * | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM | 2013-11-04 |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2013-11-04 |
|\ | |||
* | | some thoughts for madduck | Joey Hess | 2013-11-04 |
| | | |||
* | | map: Work when there are gcrypt remotes. | Joey Hess | 2013-11-04 |
| | | |||
| * | Added a comment | tanen | 2013-11-04 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-11-04 |
| | | |||
| * | Added a comment | http://joeyh.name/ | 2013-11-04 |
|/ | |||
* | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8 | 2013-11-04 |
| | |||
* | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM | 2013-11-04 |
| | |||
* | (no commit message) | Rasmus | 2013-11-04 |
| | |||
* | Added a comment | tanen | 2013-11-04 |
| | |||
* | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawkbpbjP5j8MqWt_K4NASwv0WvB8T4rQ-pM | 2013-11-04 |
| | |||
* | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU | 2013-11-04 |
| | |||
* | Added a comment | tanen | 2013-11-03 |
| | |||
* | Added a comment | http://joeyh.name/ | 2013-11-03 |
| | |||
* | (no commit message) | https://www.google.com/accounts/o8/id?id=AItOawmTlfbCC37CAjhQrS107ZWRVA_sF4s3gLU | 2013-11-03 |
| | |||
* | Added a comment | tanen | 2013-11-03 |
| | |||
* | Added a comment | http://joeyh.name/ | 2013-11-03 |
| | |||
* | Added a comment | http://joeyh.name/ | 2013-11-03 |
| | |||
* | (no commit message) | tanen | 2013-11-03 |
| |