summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* Merge branch 'master' into relativepathsGravatar Joey Hess2015-01-06
|\
| * Bugfix: A file named HEAD in the work tree could confuse some git commands ↵Gravatar Joey Hess2015-01-06
| | | | | | | | run by git-annex.
* | Merge branch 'master' into relativepathsGravatar Joey Hess2015-01-06
|\| | | | | | | | | | | Conflicts: Locations.hs debian/changelog
| * Generate shorter keys for WORM and URL, avoiding keys that are longer than ↵Gravatar Joey Hess2015-01-06
| | | | | | | | used for SHA256, so as to not break on systems like Windows that have very small maximum path length limits.
* | Switch to using relative paths to the git repository.Gravatar Joey Hess2015-01-06
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the git repository to be moved while git-annex is running in it, with fewer problems. On Windows, this avoids some of the problems with the absurdly small MAX_PATH of 260 bytes. In particular, git-annex repositories should work in deeper/longer directory structures than before. See http://git-annex.branchable.com/bugs/__34__git-annex:_direct:_1_failed__34___on_Windows/ There are several possible ways this change could break git-annex: 1. If it changes its working directory while it's running, that would be Bad News. Good news everyone! git-annex never does so. It would also break thread safety, so all such things were stomped out long ago. 2. parentDir "." -> "" which is not a valid path. I had to fix one instace of this, and I should probably wipe all calls to parentDir out of the git-annex code base; it was never a good idea. 3. Things like relPathDirToFile require absolute input paths, and code assumes that the git repo path is absolute and passes it to it as-is. In the case of relPathDirToFile, I converted it to not make this assumption. Currently, the test suite has 16 failures.
* Check git version at runtime, rather than assuming it will be the same as ↵Gravatar Joey Hess2015-01-05
| | | | | | | | | | | | | | | | | the git version used at build time when running git-checkattr and git-branch remove. It's ok to probe every time for git-branch remove because that's run quite rarely. For git-checkattr, it's run only once, when starting the --batch mode, and so again the overhead is pretty minimal. This leaves 2 places where the build version is still used. git merge might be interactive or fail if one skews, and --no-gpg-sign might not be pased, or might be passed to a git that doesn't understand it if the other skews. It seems a little expensive to check the git version each time these are used. This doesn't seem likely to cause many problems, at least compared with check-attr hanging on skew.
* sync: Fix an edge case where syncing in a bare repository would try to merge ↵Gravatar Joey Hess2015-01-05
| | | | | | | | and so fail. In the case where a remote of the bare repo has a fetch = configuration, refs/remotes/origin/master will exist, and so the merge code path tried to run in the bare repo.
* Android: Provide a version built with -fPIE -pie to support Android 5.0.Gravatar Joey Hess2015-01-05
|
* Fix build with process 1.2.1.0.Gravatar Joey Hess2015-01-04
|
* Avoid re-checksumming when migrating from hash to hashE backend. Closes: #774494Gravatar Joey Hess2015-01-04
|
* unlock: Don't allow unlocking files that have never been committed to git beforeGravatar Joey Hess2015-01-02
| | | | | Avoids an intractable problem that prevents the pre-commit hook from telling if such a file is intended to be an annexed file or not.
* touchups5.20141231Gravatar Joey Hess2014-12-31
|
* prep releaseGravatar Joey Hess2014-12-31
|
* OSX: Switched away from deprecated statfs64 interface.Gravatar Joey Hess2014-12-31
| | | | | | | | | | Getting rid of build warning warning: 'statfs64' is deprecated: first deprecated in OS X 10.6 [-Wdeprecated-declarations] 10.6 is much older than the oldest git-annex OSX port, so won't break anything.
* Windows: Fix handling of views of filenames containing '%'Gravatar Joey Hess2014-12-30
|
* Windows: Got the rsync special remote working.Gravatar Joey Hess2014-12-30
| | | | | | | | | More aggressive rsync params fixup for windows. Param may contain a url, or a file path, so check if it looks like a local file path and if so, fix it up. On windows only, rsyncUrlIsPath will treat c:foo as a path, rather than as a rsyncurl starting with a host "c".
* Windows: Fix local rsync filepath munging (fixes 26 test suite failures).Gravatar Joey Hess2014-12-30
|
* bittorrent: Fix locking problem when using addurl file://Gravatar Joey Hess2014-12-30
| | | | | Fixes: /home/joey/tmp/xxx/.git/annex/misctmp/torrent18347: openFile: resource busy (file is locked)
* Run shutdown cleanup actions even if there were failures processing the command.Gravatar Joey Hess2014-12-30
| | | | | Amoung other fixes, this means that addurl will stage added files even if adding one of the urls fails.
* setpresentkey: A new plumbing-level command.Gravatar Joey Hess2014-12-29
|
* sync: Now supports remote groups, the same way git remote update does.Gravatar Joey Hess2014-12-29
|
* Work around statfs() overflow on some XFS systems.Gravatar Joey Hess2014-12-23
| | | | | | statfs(".", 0xffa8ad50) = -1 EOVERFLOW (Value too large for defined data type) Ref <20141222221621.GO7251@onerussian.com>
* vicfg: Avoid crashing on badly encoded config data.Gravatar Joey Hess2014-12-22
|
* fix typo in recommendsGravatar Joey Hess2014-12-19
|
* prep Solstice releaseGravatar Joey Hess2014-12-19
|
* Fix build with -f-S3.Gravatar Joey Hess2014-12-19
|
* When possible, build with the haskell torrent library for parsing torrent files.Gravatar Joey Hess2014-12-18
|
* Added bittorrent special remoteGravatar Joey Hess2014-12-16
| | | | | | | | | | addurl behavior change: When downloading an url ending in .torrent, it will download files from bittorrent, instead of the old behavior of adding the torrent file to the repository. Added Recommends on aria2 and bittornado | bittorrent. This commit was sponsored by Asbjørn Sloth Tønnesen.
* Use wget -q --show-progress for less verbose wget output, when built with ↵Gravatar Joey Hess2014-12-16
| | | | wget 1.16.
* Urls can now be claimed by remotes. This will allow creating, for example, a ↵Gravatar Joey Hess2014-12-08
| | | | external special remote that handles magnet: and *.torrent urls.
* External special remote protocol now includes commands for setting and ↵Gravatar Joey Hess2014-12-08
| | | | getting the urls associated with a key.
* Webapp: When adding a new box.com remote, use the new style chunking. ↵Gravatar Joey Hess2014-12-05
| | | | Thanks, Jon Ander Peñalba.
* prep releaseGravatar Joey Hess2014-12-03
|
* remove PatchedAWS flagGravatar Joey Hess2014-12-03
| | | | | | | | Now that deps are sorted out in hackage, cabal is unlikely to try to install a too old AWS, so I don't think this flag is worth the bother of being completely correct with the dependency versioning. This avoids me needing to enable to flag on the autobuilders..
* Merge branch 's3-aws'Gravatar Joey Hess2014-12-03
|\
* | reorderGravatar Joey Hess2014-12-03
| |
* | Windows: Install ssh and other bundled programs to Git/cmd, instead of ↵Gravatar Joey Hess2014-12-03
| | | | | | | | Git/bin, since the latter is not in the default msysgit PATH.
* | Windows: ssh is no longer included in the git-annex bundle, since msysgit ↵Gravatar Joey Hess2014-12-03
| | | | | | | | includes it.
* | Don't show "(gpg)" when decrypting the remote encryption cipher, since this ↵Gravatar Joey Hess2014-12-02
| | | | | | | | could be taken to read that's the only time git-annex runs gpg, which is not the case.
* | diffdriver: New git-annex command, to make git external diff drivers work ↵Gravatar Joey Hess2014-11-24
| | | | | | | | | | | | with annexed files. Closes https://github.com/datalad/datalad/issues/18
* | Merge branch 'undo'Gravatar Joey Hess2014-11-14
|\ \
| * | Add undo action to nautilus and konqueror integration.Gravatar Joey Hess2014-11-14
| | |
| * | undo commandGravatar Joey Hess2014-11-14
| | | | | | | | | | | | This commit was sponsored by Andrew Cant.
* | | Windows: Remove Alt+A keyboard shortcut, which turns out to have scope ↵Gravatar Joey Hess2014-11-14
|/ / | | | | | | outside the menus.
* | clarification from author; lsof fixed a bugGravatar Joey Hess2014-11-13
| |
* | Work around apparent bug in lsof 4.88's -F output format.Gravatar Joey Hess2014-11-12
| |
* | proxy: for all your direct mode repository munging needsGravatar Joey Hess2014-11-12
| | | | | | | | | | | | | | This allows bypassing the direct mode guard in a safe way to do all sorts of things including git revert, git mv, git checkout ... This commit was sponsored by the WikiMedia Foundation.
* | Debian package is now maintained by Gergely Nagy.Gravatar Joey Hess2014-11-11
| |
* | pre-commit: Block partial commit of unlocked annexed file, since that left a ↵Gravatar Joey Hess2014-11-10
| | | | | | | | | | | | | | | | | | | | | | | | typechange staged in index I had hoped that the git devs could change git's handling of partial commits to not use a false index file, but seems not. So, this relies on some git internals to detect that case. The test suite has a test case added to catch it if changes to git break it. This commit was sponsored by Paul Tagliamonte.
| * add changelog entires for when this branch gets mergedGravatar Joey Hess2014-11-06
| |