Commit graph

25219 commits

Author SHA1 Message Date
Joey Hess
367d1352da git-annex-shell: Don't let configlist auto-init repository when in readonly mode.
This was potentially a hole in the readonly mode armor even before my last
commit. If the user could push a git-annex branch to a repo, they could get
git-annex-shell to initialize the repo. After my last commit, the user
didn't even need to be allowed to push a branch to init the repo, so
this hole certianly needs to be closed now.
2015-08-05 14:09:25 -04:00
Joey Hess
c5b8484c2e Simplify setup process for a ssh remote.
Now it suffices to run git remote add, followed by git-annex sync. Now the
remote is automatically initialized for use by git-annex, where before the
git-annex branch had to manually be pushed before using git-annex sync.
Note that this involved changes to git-annex-shell, so if the remote is
using an old version, the manual push is still needed.

Implementation required git-annex-shell be changed, so configlist can
autoinit a repository even when no git-annex branch has been pushed yet.
Unfortunate because we'll have to wait for it to get deployed to servers
before being able to rely on this change in the documentation.

Did consider making git-annex sync push the git-annex branch to repos that
didn't have a uuid, but this seemed difficult to do without complicating it
in messy ways.

It would be cleaner to split a command out from configlist to handle
the initialization. But this is difficult without sacrificing backwards
compatability, for users of old git-annex versions which would not use the
new command.
2015-08-05 13:49:58 -04:00
Joey Hess
b1b757bffa unused import 2015-08-05 13:25:03 -04:00
Joey Hess
8d4a72c23f response 2015-08-05 10:11:05 -04:00
Joey Hess
de9a35f64d Merge branch 'master' of ssh://git-annex.branchable.com 2015-08-05 09:45:26 -04:00
Joey Hess
1e1fae538d add missing directory params in 2 places 2015-08-05 09:42:43 -04:00
dberebi@ca13ee3cf0ff9c61fdfea562ebf725e0b6dc40ef
5ca85f1576 2015-08-05 03:02:52 +00:00
Joey Hess
a6fbf20671 longterm goal 2015-08-04 22:49:39 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
d9647df58d Added a comment: my bad 2015-08-05 02:33:46 +00:00
threadshuffle
b473c23213 Added a comment 2015-08-04 21:46:17 +00:00
Joey Hess
3e35fe0226 response 2015-08-04 17:07:52 -04:00
Joey Hess
f7d7995172 clean 2015-08-04 17:07:45 -04:00
Joey Hess
3c971c414e sshopts is never going to be null; the concat of it may be 2015-08-04 16:53:38 -04:00
threadshuffle
39b876e096 Added a comment 2015-08-04 20:49:34 +00:00
Joey Hess
4b8b3c6972 devblog 2015-08-04 16:27:55 -04:00
Joey Hess
c1298e8219 followup 2015-08-04 16:26:34 -04:00
Joey Hess
1d51542cd4 comment 2015-08-04 16:23:21 -04:00
Joey Hess
a7a34812ea Merge branch 'master' of ssh://git-annex.branchable.com 2015-08-04 16:19:42 -04:00
Joey Hess
190cf2d0c9 response 2015-08-04 16:19:05 -04:00
Joey Hess
a5bb013bd0 response 2015-08-04 16:12:56 -04:00
Joey Hess
7133b68afe Linux standalone: Work around problem that prevented it from working properly if unpacked into a directory that contains ":" or ";" in its name. 2015-08-04 16:08:19 -04:00
Joey Hess
a42acc9a42 comment 2015-08-04 16:04:35 -04:00
threadshuffle
38a53a8e56 Added a comment 2015-08-04 19:56:06 +00:00
Joey Hess
a6374b7a3d typo 2015-08-04 15:44:46 -04:00
Joey Hess
1cc8bac2cd update 2015-08-04 15:37:56 -04:00
Joey Hess
01a3bff632 response 2015-08-04 15:35:04 -04:00
Joey Hess
89bb7d1244 cmment 2015-08-04 15:33:51 -04:00
Joey Hess
f9a7d118e4 fixed build is ready 2015-08-04 15:30:51 -04:00
Joey Hess
f041a65c33 Windows: Fix bug that caused git-annex sync to fail due to missing environment variable.
I think that the problem was caused by windows not having a concept of an
env var that is set, but to the empty string. So, GIT_ANNEX_SSHOPTION
got set to "" and was not seen as set at all.

Easy fix, which also makes git-annex sync a little faster is to not set
GIT_SSH, when GIT_ANNEX_SSHOPTION has no options. Might as well let git use
ssh per usual in this case, no need to run git-annex as the proxy ssh
command..
2015-08-04 15:27:48 -04:00
Joey Hess
3cff287b26 proxy: Fix behavior when run in subdirectory of git repo.
This fixes a reversion introduced by relative path changes back last winter.

The root cause is simplifyPath "../foo" was incorrectly yielding "foo".

absPathFrom seems quite horrible. Probably most things that use it should
use </> instead.
2015-08-04 14:58:21 -04:00
Joey Hess
6e82584305 reorg 2015-08-04 14:45:16 -04:00
Joey Hess
c812018cc5 proxy: Fix removal of files deleted by the proxied command.
Git.Ref.headSha doesn't really work in direct mode as there's not a head,
so it was actually diffing against the empty tree and so not removing any
deleted files. Get the sha of the current branch instead, which is the same
thing Command.Sync does.
2015-08-04 14:43:42 -04:00
Joey Hess
2abd248cf2 improve docs 2015-08-04 14:37:43 -04:00
Joey Hess
6c15cdfcb8 proxy: Fix proxy git commit of non-annexed files in direct mode.
* proxy: Fix proxy git commit of non-annexed files in direct mode.
* proxy: If a non-proxied git command, such as git revert
  would normally fail because of unstaged files in the work tree,
  make the proxied command fail the same way.
2015-08-04 14:01:59 -04:00
Joey Hess
dfd6981785 remove workaround for old bug #763078 2015-08-04 13:00:22 -04:00
Joey Hess
098b33690e Added back debian/cabal-wrapper, since it still seems needed after all. 2015-08-04 12:25:06 -04:00
Joey Hess
82c0fd7ed8 response 2015-08-04 12:21:22 -04:00
Joey Hess
b14f76d72e remove unused language extensions, particulary unused TH 2015-08-04 12:02:27 -04:00
Joey Hess
615b0f56a7 Merge branch 'master' of ssh://git-annex.branchable.com 2015-08-04 11:53:54 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
b4182f5a97 Added a comment 2015-08-04 15:28:29 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
9ad6c8255c Added a comment 2015-08-04 15:00:03 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
c7f493fe2a 2015-08-04 14:53:27 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
45b2fb3463 2015-08-04 14:39:19 +00:00
Jan
0d307f2dc4 2015-08-04 12:41:42 +00:00
Jan
85c7e11753 2015-08-04 12:26:51 +00:00
http://senji.sdf.org/
e57359d993 2015-08-04 12:00:34 +00:00
zedr0nre@e1b86776f21c5f6a6e064c6ab8da039b54915b7d
98433d6a9f Added a comment 2015-08-04 00:00:23 +00:00
zedr0nre@e1b86776f21c5f6a6e064c6ab8da039b54915b7d
f14c4d30f5 removed 2015-08-03 23:37:22 +00:00
silvano.cirujano@c6abd56fc19f02d9c4f6b293065d64a7312b7252
411bbaf1a1 git annex assistant failing with ARM NAS 2015-08-03 23:21:16 +00:00
zedr0nre@e1b86776f21c5f6a6e064c6ab8da039b54915b7d
7b92064d66 Added a comment 2015-08-03 23:15:39 +00:00