summaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
* 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
| |
* | 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
| * Merge branch 'master' into s3-aws-multipartGravatar Joey Hess2014-11-03
| |\ | |/ |/|
* | Windows: Fix crash when user.name is not set in git config.Gravatar Joey Hess2014-10-31
| |
| * Merge branch 'master' into s3-awsGravatar Joey Hess2014-10-28
| |\ | |/ |/|
* | prep release5.20141024Gravatar Joey Hess2014-10-24
| |
| * add cabal flag for use with debian's older version of aws, which is now ↵Gravatar Joey Hess2014-10-23
| | | | | | | | patched with the necessary stuff
| * Merge branch 'master' into s3-awsGravatar Joey Hess2014-10-22
| |\ | |/ |/| | | | | Conflicts: Remote/S3.hs
* | 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
| |