Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2014-12-08 19:17:20 -04:00
commit 77e69a297f
7 changed files with 119 additions and 1 deletions

View file

@ -0,0 +1,37 @@
With release 5.20141203, I'm getting the following build error.
Remote/Helper/AWS.hs:15:18:
Could not find module Aws
Use -v to see a list of the files searched for.
Remote/Helper/AWS.hs:16:18:
Could not find module Aws.S3
Use -v to see a list of the files searched for.
I'm installing dependencies with cabal but have disabled S3 support
('-f-S3'). This setup has worked for previous releases (I'm on a machine running Arch Linux).
_features=(-f-Android
-f-Assistant
-fDbus
-fDNS
-fInotify
-fPairing
-fProduction
-f-S3
-fTestSuite
-fTDFA
-f-Webapp
-f-WebDAV
-fXMPP
-fFeed
-fQuvi
-fCryptoHash)
cabal update
cabal install c2hs
cabal install --user --force-reinstalls --only-dependencies "${_features[@]}"
cabal configure "${_features[@]}"
make

View file

@ -0,0 +1,45 @@
### Please describe the problem.
I am trying to switch to direct mode with the git work tree in a different directory than default much like described in http://git-annex.branchable.com/forum/Detached_git_work_tree__63__/
### What steps will reproduce the problem?
- Create a new git repo with the GIT_WORK_TREE and GIT_DIR set.
- git annex init test
- git annex direct
### What version of git-annex are you using? On what operating system?
5.20141125 package in Debian unstable
### Please provide any additional information below.
[[!format sh """
+dbn@loaner:~/annex $ mkdir -p test/worktree
+dbn@loaner:~/annex $ cd test/
+dbn@loaner:~/annex/test $ git init
Initialized empty Git repository in /home/dbn/annex/test/.git/
+dbn@loaner:~/annex/test $ git annex init test
init test ok
(Recording state in git...)
+dbn@loaner:~/annex/test $ git annex direct --debug
commit
[2014-12-08 03:05:45 PST] call: git ["--git-dir=/home/dbn/annex/test/.git","--work-tree=/home/dbn/annex/test/worktree","commit","-a","-m","commit before switching to direct mode"]
On branch master
Initial commit
nothing to commit
ok
[2014-12-08 03:05:45 PST] read: git ["--git-dir=/home/dbn/annex/test/.git","--work-tree=/home/dbn/annex/test/worktree","ls-files","--cached","-z","--","/home/dbn/annex/test/worktree"]
direct [2014-12-08 03:05:45 PST] read: git ["--git-dir=/home/dbn/annex/test/.git","--work-tree=/home/dbn/annex/test/worktree","symbolic-ref","HEAD"]
[2014-12-08 03:05:45 PST] read: git ["--git-dir=/home/dbn/annex/test/.git","--work-tree=/home/dbn/annex/test/worktree","show-ref","--hash","refs/heads/master"]
[2014-12-08 03:05:45 PST] call: git ["--git-dir=/home/dbn/annex/test/.git","--work-tree=/home/dbn/annex/test/worktree","checkout","-q","-B","annex/direct/master"]
[2014-12-08 03:05:45 PST] call: git ["--git-dir=/home/dbn/annex/test/.git","--work-tree=/home/dbn/annex/test/worktree","config","core.bare","true"]
[2014-12-08 03:05:45 PST] read: git ["config","--null","--list"]
fatal: core.bare and core.worktree do not make sense
git-annex: user error (git ["config","--null","--list"] exited 128)
failed
git-annex: direct: 1 failed
"""]]

View file

@ -57,6 +57,6 @@ Please provide any additional information below.
> enough version of the aws library. You need to configure the remote to
> use an appropriate value for multipart, eg:
>
> git annex enableremote cloud multipart=1GiB
> git annex enableremote cloud partsize=1GiB
>
> --[[Joey]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnWvnTWY6LrcPB4BzYEBn5mRTpNhg5EtEg"
nickname="Bence"
subject="comment 12"
date="2014-12-08T17:28:52Z"
content="""
Linked this bug to [[special remotes/S3|/special_remotes/S3]].
"""]]

View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="edward"
subject="another example"
date="2014-12-06T21:01:03Z"
content="""
I'm having the same problem:
> git-annex: c:\Users\TV\annex\.git\annex\objects\566\a33\URL--quvi&chttps&c%%www.youtube.com%watch,63v,61XS-kKX9wQk0,38index,615,38list,61PLQ-uHSnFig5NCQkhJfkn8ogXFwzrP4SIf\: openTempFile: does not exist (No such file or directory)
> failed
> git-annex: init: 1 failed
In my case the filename is slightly shorter, 154 characters, for Aaron the offending filename was 162 characters.
I think the full filename that git annex is trying to write is 270 characters:
> c:\Users\TV\annex\.git\annex\objects\566\a33\URL--quvi&chttps&c%%www.youtube.com%watch,63v,61XS-kKX9wQk0,38index,615,38list,61PLQ-uHSnFig5NCQkhJfkn8ogXFwzrP4SIf/URL--quvi&chttps&c%%www.youtube.com%watch,63v,61XS-kKX9wQk0,38index,615,38list,61PLQ-uHSnFig5NCQkhJfkn8ogXFwzrP4SIf
"""]]

View file

@ -60,6 +60,8 @@ the S3 remote.
but can be enabled or changed at any time.
time.
NOTE: there is a [[bug|/bugs/S3_upload_not_using_multipart/]] which depends on the AWS library. See [[this comment|http://git-annex.branchable.com/bugs/S3_upload_not_using_multipart/#comment-4c45dac68866d3550c0b32ed466e2c6a]] (the latest as of now).
* `fileprefix` - By default, git-annex places files in a tree rooted at the
top of the S3 bucket. When this is set, it's prefixed to the filenames
used. For example, you could set it to "foo/" in one special remote,

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="edward"
subject="URL backend file paths hit the 260 character file path limit on Windows"
date="2014-12-08T19:13:39Z"
content="""
It isn't possible to checkout a git annex repository on Windows that includes quvi videos because the file path is often greater than 260 characters.
See [[bugs/\"git-annex: direct: 1 failed\" on Windows]].
"""]]