summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* prep release5.20131127Gravatar Joey Hess2013-11-27
|
* Allow use of --unused in bare repository.Gravatar Joey Hess2013-11-27
|
* updateGravatar Joey Hess2013-11-26
|
* reinject: Allow to be used in direct mode.Gravatar Joey Hess2013-11-26
|
* updateGravatar Joey Hess2013-11-26
|
* 2 android bug fixesGravatar Joey Hess2013-11-26
|
* Bug fix: annex.version did not get set on automatic upgrade to v5 direct ↵Gravatar Joey Hess2013-11-26
| | | | mode repo, so the upgrade was performed repeatedly, slowing commands down.
* OSX upgrades seem to be working nowGravatar Joey Hess2013-11-25
|
* Added support for quvi 0.9. Slightly suboptimal due to limitations in its ↵Gravatar Joey Hess2013-11-24
| | | | interface compared with the old version.
* Fix bug that broke switching between local repositories in the webapp when ↵Gravatar Joey Hess2013-11-22
| | | | | | | they use the new guarded direct mode. git treats eg ~/annex as a bare git repository located in ~/.annex/.git if ~/annex/.git/config has core.bare=true.
* watch git-annex program file to detect upgradesGravatar Joey Hess2013-11-22
| | | | | | | | | | | | | | | | | | | | | | | | Not yet wired up to restart the assistant on upgrade; that needs careful sanity checking to wait until the upgrade is done before restarting. Used the DirWatcher here, so it gets events for any changes to the directory containing the program file. (But not subdirs.) This is necessary in order to detect when the file is renamed as part of the upgrade, which an inotify on a single file would not detect. (Also, I have DirWatcher code, but not FileWatcher code.) Note that upgrades that remove or rename a whole directory tree containing the executable will *not* trigger this code. So eg, deleting and replacing the whole standalone tarball dir tree won't work -- but untarring it over top will. So should dpkg package upgrades. Added programPath, using a new GHC feature to find the full path to the executable. The fallback code for old GHC or unsupported OS is less good; its worst failure mode would be either failing to find the program, and so not checking for upgrades, or finding a git-annex that's in PATH, but is not the one running. This commit was sponsored by John Roepke.
* updateGravatar Joey Hess2013-11-22
|
* Avoid misbehavior when addurl is used with quvi 0.9.Gravatar Joey Hess2013-11-22
| | | | | | | | In 0.9, -v shows version, rather than controlling verbosity. Still need to port to 0.9, this just avoids massively confusing addurl when quvi prints its version and exits successfully, on urls that it cannot be used with.
* merge from git-repairGravatar Joey Hess2013-11-20
|
* releasing package git-annex version 5.201311205.20131120Gravatar Joey Hess2013-11-20
|
* changelogGravatar Joey Hess2013-11-19
|
* Oops, I forgot that the test suite would be run even though the tasty test ↵Gravatar Joey Hess2013-11-19
| | | | | | | framework is not out of NEW and not in the build dependencies. The best fix is to put in an override_dh_auto_test that avoids running make test.
* Ensure that core.sharedrepository is honored when creating the .git/annex ↵Gravatar Joey Hess2013-11-18
| | | | directory.
* Ensure execute bit is set on directories when core.sharedrepsitory is set.Gravatar Joey Hess2013-11-18
|
* dropunused, addunused: Allow "all" instead of a range to act on all unused data.Gravatar Joey Hess2013-11-18
|
* releasing package git-annex version 5.201311185.20131118Gravatar Joey Hess2013-11-18
|
* webapp: Check annex.version.Gravatar Joey Hess2013-11-17
|
* Android: Adjust default .gitignore to ignore .thumbnails at any location in ↵Gravatar Joey Hess2013-11-16
| | | | the tree, not just at its top.
* Switched to the tasty test framework.Gravatar Joey Hess2013-11-15
|
* updateGravatar Joey Hess2013-11-15
|
* Direct mode .git/annex/objects directories are no longer left writableGravatar Joey Hess2013-11-15
| | | | | | | | | Because that allowed writing to symlinks of files that are not present, which followed the link and put bad content in an object location. fsck: Fix up .git/annex/object directory permissions. This commit was sponsored by an anonymous bitcoin donor.
* Fix direct mode merge bug when a direct mode file was deleted and replaced ↵Gravatar Joey Hess2013-11-15
| | | | with a directory. An ordering problem caused the directory to not get created in this case. Thanks to Tim for the test cases.
* on second thought, don't change sync to exit nonzero on successful ↵Gravatar Joey Hess2013-11-14
| | | | | | conflicted merge resolution For one thing, that breaks the test suite. May revisit later.
* assistant: Notice on startup when the index file is corrupt, and auto-repair.Gravatar Joey Hess2013-11-13
|
* repair: Handle case where index file is corrupt, but all objects are ok.Gravatar Joey Hess2013-11-13
|
* depend on git 1.8.4Gravatar Joey Hess2013-11-12
|
* separate android 4.0 and 4.3 builds neededGravatar Joey Hess2013-11-12
| | | | Also, parameterize the abdroid abi version
* Fix bug that caused bad information to be written to the git-annex branch ↵Gravatar Joey Hess2013-11-09
| | | | | | when running describe or other commands with a remote that has no uuid. Still need to fix crash caused by the bad info.
* fixupGravatar Joey Hess2013-11-08
|
* Include ssh-keygen in standalone bundle.Gravatar Joey Hess2013-11-08
|
* webapp: Improve UI around remote that have no annex.uuid set, either because ↵Gravatar Joey Hess2013-11-07
| | | | | | | | setup of them is incomplete, or because the remote git repository is not a git-annex repository. Complicated by such repositories potentially being repos that should have an annex.uuid, but it failed to be gotten, perhaps due to the past ssh repo setup bugs. This is handled now by an Upgrade Repository button.
* webapp: Avoid encoding problems when displaying the daemon log file.Gravatar Joey Hess2013-11-07
|
* watcher: Avoid loop when adding a file owned by someone else fails in ↵Gravatar Joey Hess2013-11-07
| | | | | | | | indirect mode because its permissions cannot be modified. Adding the file moved it to the annex, and then tried to set the mode. Error unwind then moved the file back, and so the watcher saw the file get deleted and then added back, and so tried again..
* sync: When there are merge conflicts that get automatically resolved, exit ↵Gravatar Joey Hess2013-11-07
| | | | nonzero at the end.
* Merge branch 'directguard'Gravatar Joey Hess2013-11-07
|\
| * rename status to info, and update docsGravatar Joey Hess2013-11-07
| |
* | Allow optionally configuring git-annex with -fEKG to enable awesome remote ↵Gravatar Joey Hess2013-11-06
| | | | | | | | monitoring interfaceat http://localhost:4242/
| * fix mergeGravatar Joey Hess2013-11-06
| |
| * Merge branch 'master' into directguardGravatar Joey Hess2013-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.
* | prep releaseGravatar Joey Hess2013-11-06
| |
| * 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
| |
| * 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.
| * 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