aboutsummaryrefslogtreecommitdiff
path: root/debian
Commit message (Collapse)AuthorAge
...
* Added annex.gnupg-decrypt-options and ↵Gravatar Joey Hess2016-05-10
| | | | | | | | | | | remote.<name>.annex-gnupg-decrypt-options, which are passed to gpg when it's decrypting data. The naming is unofrtunately not consistent, but the gnupg-options were only used for encrypting, and it's too late to change that. It would be nice to have a third setting that is always passed to gnupg, but ~/.gnupg/options can be used to specify such global options when really needed.
* Windows: Fix an over-long temp directory name.Gravatar Joey Hess2016-05-06
|
* Propigate GIT_DIR and GIT_WORK_TREE environment to external special remotes.Gravatar Joey Hess2016-05-06
| | | | | | | | | Since git-annex unsets these when started, they have to be explicitly propigated. Also, this makes --git-dir and --work-tree settings be reflected in the environment. The need for this came up in https://github.com/DanielDent/git-annex-remote-rclone/issues/3
* version: Display OS version and architecture too.Gravatar Joey Hess2016-05-05
|
* new simpler windows build environment using stack and git for windows and no ↵Gravatar Joey Hess2016-05-05
| | | | cygwin
* map: Hide dead repositories that are not connected to the graph.Gravatar Joey Hess2016-05-04
| | | | | | * map: Hide dead repositories that are not connected to the graph. * map: Changed colors; red is used for untrusted repositories and grey for dead.
* Windows: Fix several bugs in propigation of changes from the adjusted branch ↵Gravatar Joey Hess2016-05-04
| | | | back to the master branch.
* git-annex.cabal: Add Setup-Depends.Gravatar Joey Hess2016-05-04
|
* use DIRHASH-LOWER for consistencyGravatar Joey Hess2016-05-03
|
* Added DIRHASH_LOWER to external special remote protocol.Gravatar Joey Hess2016-05-03
|
* Android: Icon refresh. Thanks, freewheelinfranks.Gravatar Joey Hess2016-05-03
|
* Improve behavior when a just added http remote is not available during uuid ↵Gravatar Joey Hess2016-05-03
| | | | probe. Do not mark it as annex-ignore, so it will be tried again later.
* Fix bug that sometimes prevented git-annex smudge --clean from consuming all ↵Gravatar Joey Hess2016-05-02
| | | | its input, which resulted in git add bypassing git-annex.
* correction of scope of security problemGravatar Joey Hess2016-04-28
| | | | | AFAICS, it's not only affecting resumes, but any upload to a special remote with chunking enabled.
* Fix build with directory-1.2.6.2.Gravatar Joey Hess2016-04-28
| | | | | | It started exporting a isSymbolicLink which supports windows. But, git-annex does no use symlinks on windows yet and this conflicts with the function by the same name from unix-compat, so hide it.
* releasing package git-annex version 6.201604196.20160419Gravatar Joey Hess2016-04-28
|
* add missing dep on transformersGravatar Joey Hess2016-04-27
|
* wordingGravatar Joey Hess2016-04-27
|
* --allow-unrelated-histories will be in git 2.9.0, not 2.8.2Gravatar Joey Hess2016-04-27
| | | | Also, I had the logic backwards in the version comparison.
* reorderGravatar Joey Hess2016-04-27
|
* Fix bug that prevented resuming of uploads to encrypted special remotes that ↵Gravatar Joey Hess2016-04-27
| | | | | | used chunking. This bug could also expose the names of keys to such remotes. This is a low-severity security hole.
* use --allow-unrelated-histories for nowGravatar Joey Hess2016-04-22
| | | | | | | | I'd prefer to use the env var, but let's use what git currently supports. Revert this when the env var gets supported. Note that the version checking assumes git 2.8.2 will get support for the switch.
* assistant: Deal with upcoming git's refusal to merge unrelated histories by ↵Gravatar Joey Hess2016-04-22
| | | | | | | | | | | | | default git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from merging in unrelated branches. Since the webapp's pairing etc features often combine together repositories with unrelated histories, work around this behavior change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES when the assistant merges. Note though that this is not done for git annex sync's merges, so it will follow git's default or configured behavior.
* adjusted branches need git 2.2.0 or newerGravatar Joey Hess2016-04-22
| | | | | | When git-annex is used with a git version older than 2.2.0, disable support for adjusted branches, since GIT_COMMON_DIR is needed to update them and was first added in that version of git.
* Isolate test suite from global git config settings.Gravatar Joey Hess2016-04-20
|
* Fix bug that prevented annex.sshcaching=false configuration from taking ↵Gravatar Joey Hess2016-04-20
| | | | effect when on a crippled filesystem. Thanks, divergentdave.
* calckey: New plumbing command, calculates the key that would be used to ↵Gravatar Joey Hess2016-04-20
| | | | refer to a file
* reinject: When src file's content cannot be verified, leave it alone, ↵Gravatar Joey Hess2016-04-20
| | | | instead of deleting it.
* Avoid setting LOCPATH in linux standalone builds now that ghc has been fixed ↵Gravatar Joey Hess2016-04-20
| | | | to not hang when it cannot find locale files.
* Fix duplicate progress meter display when downloading from a git remote over ↵Gravatar Joey Hess2016-04-19
| | | | http with -J.
* prep releaseGravatar Joey Hess2016-04-18
|
* fix drop hang reported by musicmatzeGravatar Joey Hess2016-04-18
| | | | | | | | | | | | | | | | | Fix hang when dropping content needs to lock the content on a ssh remote, which occurred when the remote has git-annex version 5.20151019 or newer. Analysis: `race` runs 2 threads at once, and the hGetLine finishes first. So, it tries to cancel the waitForProcess, but unfortunately that is making a foreign call and so cannot be canceled. The remote git-annex-shell is waiting for a line on stdin before it will exit. Deadlock. This only occurred sometimes; I reproduced it going from darkstar to elephant, but not from darkstar to darkstar. Not sure how that fits into the above analysis -- perhaps a race condition is also involved? Fixed by not using `race`; now the hGetLine will fail with an exception if the remote git-annex-shell exits without any output.
* fsck: Warn when core.sharedRepository is set and an annex object file's ↵Gravatar Joey Hess2016-04-14
| | | | | | | | | | | | | | write bit is not set and cannot be set due to the file being owned by a different user. Made all Annex.Perms file mode changing functions ignore errors when core.sharedRepository is set, because the file might be owned by someone else. I don't fancy getting bug reports about crashes due to set modes in this configuration, which is a very foot-shooty configuration in the first place. The fsck warning is necessary because old repos kept files mode 444, which doesn't allow locking them, and so if the mode remains 444 due to the file being owned by someone else, the user should be told about it.
* Preserve execute bits of unlocked files in v6 mode.Gravatar Joey Hess2016-04-14
| | | | | | | | | | | | | | When annex.thin is set, adding an object will add the execute bits to the work tree file, and this does mean that the annex object file ends up executable. This doesn't add any complexity that wasn't already present, because git annex add of an executable file has always ingested it so that the annex object ends up executable. But, since an annex object file can be executable or not, when populating an unlocked file from one, the executable bit is always added or removed to match the mode of the pointer file.
* fix bug in unlocked file scanner that skipped over executable unlocked filesGravatar Joey Hess2016-04-14
|
* webapp: Update url to add gitlab.com ssh key. (Psst GitLab.. cool urls don't ↵Gravatar Joey Hess2016-04-13
| | | | change!)
* webapp: When $HOME is a git repository, and has been initialized for use by ↵Gravatar Joey Hess2016-04-13
| | | | git-annex, opening the webapp went ahead and ran the assistant there, annexing all files. Since this is almost certianly not desirable, especially when the user is just opening the webapp from a dekstop menu which happens to run it in $HOME, the webapp will now not treat such a $HOME git repository as a git-annex repository.
* smudge: Print a warning when annex.thin is set, as git's smudge interface ↵Gravatar Joey Hess2016-04-13
| | | | does not allow honoring that configuration.
* Fix build with ghc v7.11. Thanks, Gabor Greif.Gravatar Joey Hess2016-04-12
|
* prep releaseGravatar Joey Hess2016-04-12
|
* Fix bug in annex.largefiles mimetype= matching when git-annex is run in a ↵Gravatar Joey Hess2016-04-12
| | | | subdirectory of the repository.
* hard links on windowsGravatar Joey Hess2016-04-08
| | | | | * annex.thin and annex.hardlink are now supported on Windows. * unannex --fast now makes hard links on Windows.
* sync: Show output of git commit.Gravatar Joey Hess2016-04-05
| | | | | | Rationalle: User might have hook scripts whose output they want to see. Also, git commit output may tell the user they forgot to add a file. The output is not too ugly when there's nothing to commit.
* v6: Close pointer file handles more quickly, to avoid problems on Windows.Gravatar Joey Hess2016-04-04
| | | | | | Was using L.readFile, so the Handle would remain open until the garbage collector got around to it. Changed to explicit open and close, so we know it's always closed when the function returns.
* Upgrading a direct mode repository to v6 has changed to enter an adjusted ↵Gravatar Joey Hess2016-04-04
| | | | | | | | unlocked branch. This makes the direct mode to v6 upgrade able to be performed in one clone of a repository without affecting other clones, which can continue using v5 and direct mode.
* Merge branch 'adjustedbranch'Gravatar Joey Hess2016-03-31
|\
* | log --raw-date: Use to display seconds from unix epoch.Gravatar Joey Hess2016-03-29
| |
* | log: Display time with time zone.Gravatar Joey Hess2016-03-29
| | | | | | | | Also cleaned up ugliness with zombies.
| * init: Automatically enter the adjusted unlocked branch when in a v6 repo on ↵Gravatar Joey Hess2016-03-29
| | | | | | | | a filesystem not supporting symlinks.
| * docs for git-annex adjustGravatar Joey Hess2016-03-29
|/