summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* 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
* map: Work when there are gcrypt remotes.Gravatar Joey Hess2013-11-04
|
* Fix zombie process that occurred when switching between repository views in ↵Gravatar Joey Hess2013-11-02
| | | | the webapp.
* Fix enabling of gcrypt repository accessed over ssh; git-annex-shell ↵Gravatar Joey Hess2013-11-02
| | | | gcryptsetup had a bug that caused it to fail with permission denied.
* gcrypt, bup: Fix bug that prevented using these special remotes with ↵Gravatar Joey Hess2013-11-02
| | | | | | | | | encryption=pubkey. I think both of these are all that's affected, but I went ahead and fixed all the remotes that set their config to M.empty to instead store the actual config. Who knows what will expect it to be actually present in future, the Remote instance of getGpgEncParams came to..
* sync: Work even when the local git repository is new and empty, with no ↵Gravatar Joey Hess2013-11-02
| | | | master branch.
* Improve local pairing behavior when two computers both try to start the ↵Gravatar Joey Hess2013-11-02
| | | | | | | | | | | | | | | | | pairing process separately. I was able to reproduce something very like this bug by starting pairing separately on both computers under poor network conditions (ie, weak wifi on my front porch). Neither computer showed an alert for the PairReq messages it was seeing (intermittently) from the other. So, I've made a new PairReq message that has not been seen before always make the alert pop up, even if the assistant thinks it is in the middle of its own pairing process (or even another pairing process with a different box on the LAN). (This shouldn't cause a rogue PairAck to disrupt a pairing process part way through.)
* prep releaseGravatar Joey Hess2013-11-01
|
* unannex: New, much slower, but more safe behaviorGravatar Joey Hess2013-10-28
| | | | | | | | | | | | Copies files out of the annex. This avoids an unannex of one file breaking other files that link to the same content. Also, it means that the content remains in the annex using up space until cleaned up with "git annex unused". (The behavior of unannex --fast has not changed; it still hard links to content in the annex. --fast was not made the default because it is potentially unsafe; editing such a hard linked file can unexpectedly change content stored in the annex.)
* add --want-get and --want-drop optionsGravatar Joey Hess2013-10-28
| | | | | New --want-get and --want-drop options which can be used to test preferred content settings. For example, "git annex find --in . --want-drop"
* The "git annex content" command is renamed to "git annex wanted".Gravatar Joey Hess2013-10-28
|
* add: Fix reversion in 4.20130827 when adding unlocked files that have not ↵Gravatar Joey Hess2013-10-28
| | | | | | | | | | | | yet been committed. catKeyFileHEAD is still checked too, because when doing a git commit with unlocked files, the file gets staged to the index, so is not typechanged there. (This is also why git annex add foo; git annex unlock foo; git commit -a does not re-annex foo, because there is no indication left that it was added.)
* assistant: Support repairing git remotes that are locally accessibleGravatar Joey Hess2013-10-27
| | | | | | | | (eg, on removable drives) gcrypt remotes are not yet handled. This commit was sponsored by Sören Brunk.
* assistant: Automatically repair damanged git repository, if it can be done ↵Gravatar Joey Hess2013-10-26
| | | | without losing data.
* changelogGravatar Joey Hess2013-10-26
|
* directory, webdav: Fix bug introduced in version 4.20131002 that caused the ↵Gravatar Joey Hess2013-10-26
| | | | chunkcount file to not be written. Work around repositories without such a file, so files can still be retreived from them.
* webapp: When setting up a bare shared repository, enable non-fast-forward ↵Gravatar Joey Hess2013-10-26
| | | | pushes.
* assistant: When autostarted, wait 5 seconds before running the startup scan, ↵Gravatar Joey Hess2013-10-26
| | | | to avoid contending with the user's desktop login process.
* releasing package git-annex version 4.201310244.20131024Gravatar Joey Hess2013-10-24
|
* updateGravatar Joey Hess2013-10-23
|
* add repair commandGravatar Joey Hess2013-10-23
|
* webapp: Fix bug when adding a remote and git-remote-gcrypt is not installed.Gravatar Joey Hess2013-10-22
|
* webapp: Move sidebar to the right hand side of the screen.Gravatar Joey Hess2013-10-21
|
* git-recover-repository 1/2 doneGravatar Joey Hess2013-10-20
|
* remove workaround for bug in git 1.8.4r0Gravatar Joey Hess2013-10-20
|
* Windows: Deal with strange msysgit 1.8.4 behavior of not understanding DOS ↵Gravatar Joey Hess2013-10-17
| | | | formatted paths for --git-dir and --work-tree.
* update for DiffTree type change (which fixes assistant in subdir confusion bug)Gravatar Joey Hess2013-10-17
|
* S3: Try to ensure bucket name is valid for archive.org.Gravatar Joey Hess2013-10-16
|
* sync: Fix automatic resolution of merge conflicts where one side is an ↵Gravatar Joey Hess2013-10-16
| | | | | | | | | annexed file, and the other side is a non-annexed file, or a directory. Note that this case is only fully automatically resolved in direct mode. In indirect mode, git merge moves the file to file~HEAD, and replaces it with the directory, and leaves the file in unmerged state, and sync doesn't yet change that.
* Work around sed output difference that led to version containing a newline ↵Gravatar Joey Hess2013-10-16
| | | | on OSX.
* Deal with git check-attr -z output format change in git 1.8.5.Gravatar Joey Hess2013-10-15
| | | | | | | | | | I have not actually tested with 1.8.5, which is not yet relesaed, but git.git commit f7cd8c50b9ab83e084e8f52653ecc8d90665eef2 changes -z to also apply to output, without regards to back-compat. (But with pretty good reasons.) New code should work with both versions, by fingerprinting for NULs and newlines.
* add schedule commandGravatar Joey Hess2013-10-13
| | | | | Mostly because it gives me an excuse and a hook to document the schedule expression format.