summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* 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.
* prep release5.20141125Gravatar Joey Hess2014-11-05
|
* Remove fixup code for bad bare repositories created by versions 5.20131118 ↵Gravatar Joey Hess2014-11-04
| | | | through 5.20131127. That fixup code would accidentially fire when --git-dir was incorrectly pointed at the working tree of a git-annex repository, resulting in data loss. Closes: #768093
* Windows: Fix crash when user.name is not set in git config.Gravatar Joey Hess2014-10-31
|
* prep release5.20141024Gravatar Joey Hess2014-10-24
|
* enableremote: When the remote has creds, update the local creds cache file. ↵Gravatar Joey Hess2014-10-22
| | | | Before, the old version of the creds could be left there, and would continue to be used.
* include creds location in infoGravatar Joey Hess2014-10-21
| | | | | | | | This is intended to let the user easily tell if a remote's creds are coming from info embedded in the repository, or instead from the environment, or perhaps are locally stored in a creds file. This commit was sponsored by Frédéric Schütz.
* info: When passed the name or uuid of a remote, displays info about that remote.Gravatar Joey Hess2014-10-21
| | | | | | No per-remote-type info yet. This commit was sponsored by Stanley Yamane.
* info: When run on a single annexed file, displays some info about the file, ↵Gravatar Joey Hess2014-10-21
| | | | including its key and size.
* glacier: Fix pipe setup when calling glacier-cli to retrieve an object.Gravatar Joey Hess2014-10-20
|
* updateGravatar Joey Hess2014-10-16
|
* Use haskell setenv library to clean up several ugly workarounds for ↵Gravatar Joey Hess2014-10-15
| | | | | | | | | inability to manipulate the environment on windows. Didn't know that this library existed! This includes making git-annex not re-exec itself on start on windows, and making the test suite on Windows run tests without forking.
* initremote: Don't allow creating a special remote that has the same name as ↵Gravatar Joey Hess2014-10-15
| | | | | | | | | an existing git remote. This is not a complete fix. For one, git remote will happily go add a remote that has the same name as an existing special remote. For another, enableremote will enable a special remote over top of an existing git remote. And, also, the webapp might.
* Remove hurd stuff from cabal file, since hackage currently rejects it.Gravatar Joey Hess2014-10-15
| | | | https://github.com/haskell/hackage-server/issues/269
* vicfg: Deleting configurations now resets to the default, where before it ↵Gravatar Joey Hess2014-10-14
| | | | | | | | | has no effect. Added a Default instance for TrustLevel, and was able to use that to clear up several other parts of the code too. This commit was sponsored by Stephan Schulz
* prep release5.20141013Gravatar Joey Hess2014-10-13
|
* repair: Prevent auto gc from happening when fetching from a remote.Gravatar Joey Hess2014-10-12
|
* map: Handle .git prefixed remote repos. Closes: #614759Gravatar Joey Hess2014-10-12
|
* S3: Fix embedcreds=yes handling for the Internet Archive.Gravatar Joey Hess2014-10-12
| | | | | Before, embedcreds=yes did not cause the creds to be stored in remote.log, but also prevented them being locally cached.
* Support building with yesod 1.4.Gravatar Joey Hess2014-10-09
| | | | | | | | The new yesod needs the ViewPatterns extension. Also, a TH splice in Assistant/Threads/WebApp.hs failed to work without OverLoadedStrings. This commit was sponsored by Brock Spratlen.
* add copyright of code copied from yesodGravatar Joey Hess2014-10-09
|
* rewrote and expanded package descriptionGravatar Joey Hess2014-10-03
|
* Adjust cabal file to support building w/o assistant on the hurd.Gravatar Joey Hess2014-09-29
| | | | | I used to have this and hackage rejected the os(gnu), so I am going to see if the new hackage still rejects it.
* prep release5.20140927Gravatar Joey Hess2014-09-27
|
* Add temporary workaround for bug #763078 which broke building on armel and ↵Gravatar Joey Hess2014-09-27
| | | | armhf.
* Really depend (not just build-depend) on new enough git for --no-gpg-sign to ↵Gravatar Joey Hess2014-09-27
| | | | work. Closes: #763057
* prep releaseGravatar Joey Hess2014-09-26
|
* Work around failure to build on mips by using cabal, not Setup, to build in ↵Gravatar Joey Hess2014-09-26
| | | | debian/rules.
* Depend on new enough git for --no-gpg-sign to work. Closes: #762446Gravatar Joey Hess2014-09-22
|
* prep release5.20140919Gravatar Joey Hess2014-09-19
|
* CVE id assignedGravatar Joey Hess2014-09-19
|
* deal with old repositories with non-encrypted credsGravatar Joey Hess2014-09-18
| | | | | | | | | | | | | | | | | See 2fb7ad68637cc4e1092f835055a974f141808ca0 for backstory about how a repo could be in this state. When decryption fails, the repo must be using non-encrypted creds. Note that creds are encrypted/decrypted using the encryption cipher which is stored in the repo, so the decryption cannot fail due to missing gpg keys etc. (For !shared encryptiom, the cipher is iteself encrypted using some gpg key(s), and the decryption of the cipher happens earlier, so not affected by this change. Print a warning message for !shared repos, and continue on using the cipher. Wrote a page explaining what users hit by this bug should do. This commit was sponsored by Samuel Tardieu.
* glacier, S3: Fix bug that caused embedded creds to not be encypted using the ↵Gravatar Joey Hess2014-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remote's key. encryptionSetup must be called before setRemoteCredPair. Otherwise, the RemoteConfig doesn't have the cipher in it, and so no cipher is used to encrypt the embedded creds. This is a security fix for non-shared encryption methods! For encryption=shared, there's no security problem, just an inconsistentency in whether the embedded creds are encrypted. This is very important to get right, so used some types to help ensure that setRemoteCredPair is only run after encryptionSetup. Note that the external special remote bypasses the type safety, since creds can be set after the initial remote config, if the external special remote program requests it. Also note that IA remotes never use encryption, so encryptionSetup is not run for them at all, and again the type safety is bypassed. This leaves two open questions: 1. What to do about S3 and glacier remotes that were set up using encryption=pubkey/hybrid with embedcreds? Such a git repo has a security hole embedded in it, and this needs to be communicated to the user. Is the changelog enough? 2. enableremote won't work in such a repo, because git-annex will try to decrypt the embedded creds, which are not encrypted, so fails. This needs to be dealt with, especially for ecryption=shared repos, which are not really broken, just inconsistently configured. Noticing that problem for encryption=shared is what led to commit cc54ff9e49260cd94f938e69e926a273e231ef4e, which tried to fix the problem by not decrypting the embedded creds. This commit was sponsored by Josh Taylor.
* Revert "S3, Glacier, WebDAV: Fix bug that prevented accessing the creds when ↵Gravatar Joey Hess2014-09-18
| | | | | | | | | | the repository was configured with encryption=shared embedcreds=yes." This reverts commit cc54ff9e49260cd94f938e69e926a273e231ef4e. I can find no basis for that commit and think that I made it in error. setRemoteCredPair always encrypts using the cipher from remoteCipher, even when the cipher is shared.
* add: In direct mode, adding an annex symlink will check it into git, as was ↵Gravatar Joey Hess2014-09-18
| | | | already done in indirect mode.
* WebDav: Fix enableremote crash when the remote already exists. (Bug ↵Gravatar Joey Hess2014-09-17
| | | | introduced in version 5.20140817.)
* Windows: Avoid crashing trying to list gpg secret keys, for gcrypt which is ↵Gravatar Joey Hess2014-09-16
| | | | not yet supported on Windows.
* assistant: Detect when repository has been deleted or moved, and ↵Gravatar Joey Hess2014-09-15
| | | | automatically shut down the assistant. Closes: #761261
* prep5.20140915Gravatar Joey Hess2014-09-15
|
* Fix build with optparse-applicative 0.10. Closes: #761484Gravatar Joey Hess2014-09-14
| | | | This also works with 0.9, and probably 0.8.
* Rather than crashing when there's a problem with the requested bloomfilter ↵Gravatar Joey Hess2014-09-12
| | | | capacity/accuracy, fall back to a reasonable default bloom filter size.