Commit graph

25428 commits

Author SHA1 Message Date
https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf574
3bdadcb7fb Added a comment: needed a gpg.conif 2015-09-16 04:20:54 +00:00
whlabratz@d10941ab2681deb87122fd8f6da51f3dcdb8dbe5
b2041a592c Added a comment: Listing GPG keys enabled for a remote with hybrid encryption 2015-09-15 22:37:35 +00:00
Joey Hess
453c355122 comment 2015-09-15 13:38:09 -04:00
Joey Hess
f77a873a15 improve comment 2015-09-15 13:12:21 -04:00
Joey Hess
b08c6d4e16 Merge branch 'master' of ssh://git-annex.branchable.com 2015-09-15 12:52:09 -04:00
Joey Hess
16947ef654 Fix bug in combination of preferred and required content settings. When one was set to the empty string and the other set to some expression, this bug caused all files to be wanted, instead of only files matching the expression.
Avoid: MAny `MOr` otherexpression
Which matches anything.
2015-09-15 12:50:14 -04:00
Jonan
dda36b7adf Added a comment 2015-09-15 16:13:20 +00:00
Joey Hess
7088bc8621 comment 2015-09-15 12:01:06 -04:00
Joey Hess
294ec009e9 comment 2015-09-15 11:59:24 -04:00
Joey Hess
ca33921bf2 I've been not documenting these import Preludes used to deal with the AMP transition 2015-09-15 11:32:47 -04:00
Simon Jakobi
b468890f3e Silence redundant import warning with base-4.8.* 2015-09-15 11:32:23 -04:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
c4eaa5e42b 2015-09-15 11:30:09 +00:00
Jonan
82743a3dc0 2015-09-15 10:39:03 +00:00
Joey Hess
b88739f0d0 avoid auto-enabling a remote that's already enabled 2015-09-14 15:34:15 -04:00
Joey Hess
c919489c3e avoid autoenable of dead special remotes 2015-09-14 15:28:14 -04:00
Joey Hess
b1fbb08dc5 devblog 2015-09-14 15:09:50 -04:00
Joey Hess
9cfb96c53d Special remotes configured with autoenable=true will be automatically enabled when git-annex init is run. 2015-09-14 14:49:48 -04:00
Joey Hess
3f47d1b351 Improve bash completion, so it completes names of remotes and backends in appropriate places.
Not necessarily everywhere, but a lot of the most often used places.

Re the use of .Internal, see
https://github.com/pcapriotti/optparse-applicative/issues/155
2015-09-14 13:19:04 -04:00
Joey Hess
ffa8221517 annex.hardlink extended to also try to use hard links when copying from the repository to a remote.
Also, it used to only check that one of the repos was not in direct mode;
now when either repo is direct mode, annex.hardlink won't have an effect.
2015-09-14 12:13:38 -04:00
Joey Hess
c5260f5cb0 Merge branch 'master' of ssh://git-annex.branchable.com 2015-09-13 16:04:34 -04:00
Joey Hess
54cf9c1ef3 close 2015-09-13 16:03:35 -04:00
git-annex@545634279b585e2a5818702b3c251d1ecd23da10
aea490394b 2015-09-13 17:51:26 +00:00
Joey Hess
2d2e94798f merge hlint changes from propellor 2015-09-13 13:39:48 -04:00
Joey Hess
6ce5fea50c Merge branch 'master' of ssh://git-annex.branchable.com 2015-09-13 13:21:34 -04:00
Joey Hess
1cc1f9f4e5 sync: Add --no-commit, --no-pull, --no-push options to turn off parts of the sync process, as well as supporting --commit, --pull, --push, and --no-content options to specify the (current) default behavior. 2015-09-13 13:15:35 -04:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
eff474d048 Added a comment 2015-09-13 12:52:51 +00:00
https://id.koumbit.net/anarcat
8e30053d5b toc 2015-09-12 22:18:40 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
d662a36a18 Added a comment 2015-09-11 20:46:01 +00:00
Joey Hess
eef464900a update for git for windows 2015-09-11 14:34:35 -04:00
Joey Hess
5aa5e92da7 git for windows includes curl, so avoid bundling it 2015-09-11 14:01:42 -04:00
Joey Hess
8fddc7eb8a response 2015-09-11 13:59:00 -04:00
Joey Hess
64a1f6d4d7 fix PATH
zcat is needed from cygwin to build
2015-09-11 13:46:29 -04:00
Joey Hess
aca0fd53b2 comment 2015-09-11 13:41:37 -04:00
Joey Hess
b9f662bd93 Merge branch 'master' of ssh://git-annex.branchable.com 2015-09-11 13:23:01 -04:00
Joey Hess
eab8c512d8 cleanup 2015-09-11 13:21:58 -04:00
Joey Hess
1355a241ea now fully working even when git is not in path
The vbs launchers now are passed the path where git-annex was installed to,
so they will work when it's not in path.
2015-09-11 13:18:21 -04:00
Joey Hess
c7a6296ef3 get git-annex working even if user doesn't add git to path
This is pretty complicated, but I have both "git-annex" and "git annex"
working both in the git bash shell even with git not added to path.
And, when git's added to path, both work from MS-DOS prompt window too.

I think that the webapp startup does still need git in path, so
instructions will keep saying to do that. But, users often disregard them,
and hopefully this will reduce support traffic.

Also, switched the wget from the cygwin one to the msys2 one, avoiding the
complication of needing to bundle any cygwin dlls.
2015-09-11 12:44:27 -04:00
olivier.berger@bb28df880236e55a6bfeca92cc3de8ec424f2eba
61ca4b6ea1 Added a comment: Maybe Git 2.5 must be installed only as 32 bit ? 2015-09-11 15:42:18 +00:00
olivier.berger@bb28df880236e55a6bfeca92cc3de8ec424f2eba
fe532a6fbc Added a comment: Not completely fixed if git not installed on C: 2015-09-11 15:31:26 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
35af7635d5 2015-09-11 11:54:36 +00:00
OlivierBerger
19ed545b96 Added a comment: Seems t owork now with git 2.5 for windows and daily build on windows 7 2015-09-11 11:43:43 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
793f201e8e 2015-09-11 10:17:03 +00:00
aloukian@c071735c08bc04266b792aa478ad1bae2d6a8b50
f99fb300c2 Added a comment 2015-09-11 00:42:03 +00:00
Joey Hess
e766dcc940 formatting 2015-09-10 19:25:01 -04:00
Joey Hess
b42aee4ef3 update for current status
Revert this commit after next release
2015-09-10 19:18:34 -04:00
Joey Hess
6158036e23 Switched to using git for Windows, rather than msysgit.
Using msysgit with git-annex is no longer supported.

At the same time, I'm updating the rsync.exe in my downloads repository
with the one from msys2.

Note that rsync is currently still being ldded and installed in Git/cmd/
like the other cygwin programs. The ldd fails and this failure is ignored.
It would be better to special case it to go in Git/usr/bin/, so that the
user can't run rsync in a dos prompt window, which doesn't work, as it needs
additional libs. However, as far as git-annex running rsync running ssh,
it works ok in this location.

Removed the ssh.cmd and ssh-keygen.cmd; these are not needed with git for
windows. Keeping them would let ssh be run manually from a dos prompt
window, but that's not really a goal.
2015-09-10 19:16:30 -04:00
Joey Hess
b2f207d15b comment 2015-09-10 18:02:54 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
301090cc44 Added a comment 2015-09-10 18:44:26 +00:00
aloukian@c071735c08bc04266b792aa478ad1bae2d6a8b50
c322fc7692 2015-09-10 18:23:48 +00:00
Joey Hess
bac9793362 found a fix 2015-09-10 14:21:15 -04:00