summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* add new status commandGravatar Joey Hess2013-11-07
| | | | | | | | | | | | | | | This works for both direct and indirect mode. It may need some performance tuning. Note that unlike git status, it only shows the status of the work tree, not the status of the index. So only one status letter, not two .. and since files that have been added and not yet committed do not differ between the work tree and the index, they are not shown. Might want to add display of the index vs the last commit eventually. This commit was sponsored by an unknown bitcoin contributor, whose contribution as been going up lately! ;)
* rename status to info, and update docsGravatar Joey Hess2013-11-07
|
* adjust test suite to work with and test direct mode guardGravatar Joey Hess2013-11-06
|
* updateGravatar Joey Hess2013-11-06
|
* fix mergeGravatar Joey Hess2013-11-06
|
* Merge branch 'master' into directguardGravatar Joey Hess2013-11-06
|\
| * add news item for git-annex 4.201311064.20131106Gravatar Joey Hess2013-11-06
| |
| * Added a commentGravatar http://joeyh.name/2013-11-06
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-06
| |\
| * | typoGravatar Joey Hess2013-11-06
| | |
| | * Added a commentGravatar http://joeyh.name/2013-11-06
| | |
| * | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-06
| |\|
| | * Added a commentGravatar http://joeyh.name/2013-11-06
| | |
| | * lots more details and screenshotsGravatar https://id.koumbit.net/anarcat2013-11-06
| | |
| * | Fix exception handling bug that could cause .git/annex/index to be used for ↵Gravatar Joey Hess2013-11-06
| | | | | | | | | | | | git commits outside the git-annex branch. Known to affect git-annex when used with the git shipped with Ubuntu 13.10.
| * | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-06
| |\|
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawm0v2FLGWoqzKCMg-RR2cORJ1vnj0HshXA2013-11-06
| | |
| * | prep releaseGravatar Joey Hess2013-11-06
| | |
| | * weird permission bug in the webappGravatar https://id.koumbit.net/anarcat2013-11-06
| | |
| * | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-06
| |\|
| | * Added a commentGravatar http://joeyh.name/2013-11-06
| | |
| | * (no commit message)Gravatar https://id.koumbit.net/anarcat2013-11-06
| | |
| | * tiny little cosmetic bugGravatar https://id.koumbit.net/anarcat2013-11-06
| | |
| * | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-06
| |\|
| | * moving discussion to a new bug reportGravatar https://id.koumbit.net/anarcat2013-11-06
| | |
| | * file the remaining bug separatelyGravatar https://id.koumbit.net/anarcat2013-11-06
| | |
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2013-11-06
| | |
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U2013-11-06
| | |
| * | use pure or return rather than (:[]) or \x -> [x]Gravatar Joey Hess2013-11-06
| |/
| * point at my fork of gcrypt, which is currently neededGravatar Joey Hess2013-11-05
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-05
| |\
| * | devblogGravatar Joey Hess2013-11-05
| | |
* | | work around lack of receive.denyCurrentBranch in direct modeGravatar Joey Hess2013-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.
| | * (no commit message)Gravatar https://id.koumbit.net/anarcat2013-11-05
| | |
* | | factor out updateGravatar Joey Hess2013-11-05
| | |
| | * problem partially fixedGravatar https://id.koumbit.net/anarcat2013-11-05
| | |
| | * Added a comment: feedbackGravatar https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio2013-11-05
| | |
* | | v5 for direct mode, with automatic upgradeGravatar Joey Hess2013-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 modeGravatar Joey Hess2013-11-05
| | |
* | | refactored hook setupGravatar Joey Hess2013-11-05
| | |
* | | support direct mode repositories with core.bare=true (not yet default)Gravatar Joey Hess2013-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.
| | * Added a commentGravatar http://joeyh.name/2013-11-05
| | |
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkzwmw_zyMpZC9_J7ey--woeYPoZkAOgGw2013-11-05
| | |
* | | pass -c option on to all git commands runGravatar Joey Hess2013-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
| * Added a commentGravatar http://joeyh.name/2013-11-05
| |
| * Added a commentGravatar http://joeyh.name/2013-11-05
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-05
|\
* | fixed long agoGravatar Joey Hess2013-11-05
| |
| * Added a commentGravatar http://joeyh.name/2013-11-05
| |
| * Added a commentGravatar http://joeyh.name/2013-11-05
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-16 20:22:24 +0000