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

This commit is contained in:
Joey Hess 2014-02-18 21:36:08 -04:00
commit fafb51946c
9 changed files with 210 additions and 1 deletions

View file

@ -0,0 +1,24 @@
### Please describe the problem.
There are a lot of differences in the behaviour of usual commands and commans using --all.
The specific problem I found was that "git annex fsck --all" will only checksum it seems and not report back numcopies failures.
Checking if objects/old versions have propagated is not possible without it or do I miss something.
(As additional note not sure if related. It seems that git annex fsck --all is running much faster in my tests 1/3 faster. Any reason for that? Bug related?)
### What steps will reproduce the problem?
compare "git annex fsck" vs "git annex fsck" (no numcopies check)
### What version of git-annex are you using? On what operating system?
git-annex version: 5.20140210-gd99db49
Linux (Ubuntu 13.10)
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
# End of transcript or log.
"""]]

View file

@ -0,0 +1,81 @@
### Please describe the problem.
When adding files to the annex and then deciding against it in an "unusual" way, git-annex gets confused and the file left behind can't be removed from the annex...
### What steps will reproduce the problem?
1. Add file with "git annex add"
2. Decide you don't need the file add all
3. "git rm -f newfile"
4. "git annex unused"
5. "git annex dropunused all"
### What version of git-annex are you using? On what operating system?
git-annex version: 5.20140210 on Debian unstable
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
$ git init
Initialized empty Git repository in /tmp/foo/.git/
$ ls -l
total 0
$ cp ~/download/hub-ctrl.c .
$ git add hub-ctrl.c
$ git commit
[master (root-commit) ed7eb68] A file.
1 file changed, 412 insertions(+)
create mode 100644 hub-ctrl.c
$ cp ~/download/hub-ctrl .
$ ls -l
total 28
-rwxr-xr-x 1 tobias tobias 14130 Feb 19 00:49 hub-ctrl
-rw-r--r-- 1 tobias tobias 9270 Feb 19 00:48 hub-ctrl.c
$ git annex init
init ok
(Recording state in git...)
$ git annex add
add hub-ctrl ok
(Recording state in git...)
$ git status
On branch master
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
new file: hub-ctrl
$ git rm hub-ctrl
error: the following file has changes staged in the index:
hub-ctrl
(use --cached to keep the file, or -f to force removal)
$ git rm -f hub-ctrl
rm 'hub-ctrl'
$ git status
On branch master
nothing to commit, working directory clean
$ git annex unused
unused . (checking for unused data...) (checking HEAD...)
Some annexed data is no longer used by any files:
NUMBER KEY
1 SHA256E-s14130--d4e777ba2b99ed0a520fbabe7b93cf2165373b4945afe8dcb626231d9051f19d
(To see where data was previously used, try: git log --stat -S'KEY')
To remove unwanted data: git-annex dropunused NUMBER
ok
$ git annex dropunused all
dropunused 1 (unsafe)
Could only verify the existence of 0 out of 1 necessary copies
Rather than dropping this file, try using: git annex move
(Use --force to override this check, or adjust numcopies.)
failed
git-annex: dropunused: 1 failed
$
# End of transcript or log.
"""]]

View file

@ -0,0 +1,22 @@
### Please describe the problem.
Attempting to clone the git repository produces
(master) cayley:git-annex% git checkout -f HEAD
error: unable to create file doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47__..__47__C:__92__Users__92____91__...__93____92__annex__92__.git__47__config__39__:_Invalid_argument___40__Windows__41__.mdwn (File name too long)
fatal: cannot create directory at 'doc/bugs/fatal:_unable_to_access___39__..__47__..__47__..__47__..__47__C:__92__Users__92____91__...__93____92__annex__92__.git__47__config__39__:_Invalid_argument___40__Windows__41__': File name too long
### What steps will reproduce the problem?
I get the above with either
git clone https://github.com/joeyh/git-annex
or (after this fails) retrying with
cd git-annex
git checkout -f HEAD
### What version of git-annex are you using? On what operating system?
I am running git 1.9.0 from git (5f95c9f850b19b368c43ae399cc831b17a26a5ac in the git git repo) on Ubuntu 13.04.

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://geoffreyirving.myopenid.com/"
nickname="Geoffrey Irving"
subject="encrypted home directory"
date="2014-02-18T18:05:24Z"
content="""
It looks like this problem is related to using an encrypted home directory.
"""]]

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="stp"
ip="188.193.207.34"
subject="Update one forgetting keys no longer present"
date="2014-02-17T23:21:49Z"
content="""
I have some repos where due to some hiccups file versions (not in the working tree anymore) were lost and now they come up again and again when fsck is running.
So I would be happy if I could make my repos forget these not available files via \"git annex forget $key\" and perhaps even have a better solution to show all objects with numcopies=0.
"""]]

View file

@ -0,0 +1,27 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o"
nickname="Aaron"
subject="Too big to fsck"
date="2014-02-17T22:33:38Z"
content="""
Hi,
My Webapp isn't working:
$ git-annex webapp
error: refs/gcrypt/gitception+ does not point to a valid object!
error: refs/remotes/Beta/git-annex does not point to a valid object!
error: refs/remotes/Beta/master does not point to a valid object!
fatal: unable to read tree 656e7db5be172f01c0b6994d01f1a08d1273af12
So I tried to repair it:
$ git-annex repair
Running git fsck ...
Stack space overflow: current size 8388608 bytes.
Use `+RTS -Ksize -RTS' to increase it.
So I tried to follow your advice here and increase the stack:
$ git-annex +RTS -K35000000 -RTS fsck
git-annex: Most RTS options are disabled. Link with -rtsopts to enable them.
I wasn't sure what to do next, so any help would be appreciated.
"""]]

View file

@ -24,7 +24,7 @@ repository use the same Glacier remote is easy:
# cd /media/usb/annex
# git pull laptop
# git annex initremote glacier
# git annex enableremote glacier
initremote glacier (gpg) ok
Now the remote can be used like any other remote.

View file

@ -0,0 +1,36 @@
[[!comment format=mdwn
username="http://grossmeier.net/"
nickname="greg"
subject="missing steps?"
date="2014-02-18T23:51:00Z"
content="""
I setup a glacier remote on one machine and it successfully created the vault and is syncing files to it.
One another machine, after git-annex sync'ing, I did:
[[!format sh \"\"\"
greg@x200s:~/Photos$ git-annex enableremote glacier
enableremote glacier
Set both AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY to use glacier
git-annex: Failed creating glacier vault.
\"\"\"]]
So then I try:
[[!format sh \"\"\"
greg@x200s:~/Photos$ AWS_ACCESS_KEY_ID=HAHA AWS_SECRET_ACCESS_KEY=NOPE git-annex --debug enableremote glacier
[2014-02-18 15:43:56 PST] read: git [\"--git-dir=/home/greg/Photos/.git\",\"--work-tree=/home/greg/Photos\",\"show-ref\",\"git-annex\"]
[2014-02-18 15:43:56 PST] read: git [\"--git-dir=/home/greg/Photos/.git\",\"--work-tree=/home/greg/Photos\",\"show-ref\",\"--hash\",\"refs/heads/git-annex\"]
[2014-02-18 15:43:56 PST] read: git [\"--git-dir=/home/greg/Photos/.git\",\"--work-tree=/home/greg/Photos\",\"log\",\"refs/heads/git-annex..8108714116d08f93aa427b9ddced48cd5f2b4b72\",\"--oneline\",\"-n1\"]
[2014-02-18 15:43:56 PST] read: git [\"--git-dir=/home/greg/Photos/.git\",\"--work-tree=/home/greg/Photos\",\"log\",\"refs/heads/git-annex..742ba908f791e440a6cc85073ef505a96dd66aa4\",\"--oneline\",\"-n1\"]
[2014-02-18 15:43:56 PST] read: git [\"--git-dir=/home/greg/Photos/.git\",\"--work-tree=/home/greg/Photos\",\"log\",\"refs/heads/git-annex..071487394544a20253a70ada4ea71fcc28f9fc13\",\"--oneline\",\"-n1\"]
[2014-02-18 15:43:56 PST] read: git [\"--git-dir=/home/greg/Photos/.git\",\"--work-tree=/home/greg/Photos\",\"log\",\"refs/heads/git-annex..c8aecc22da7b84bbb82f083ce783cc699cef1c67\",\"--oneline\",\"-n1\"]
[2014-02-18 15:43:56 PST] chat: git [\"--git-dir=/home/greg/Photos/.git\",\"--work-tree=/home/greg/Photos\",\"cat-file\",\"--batch\"]
enableremote glacier [2014-02-18 15:43:56 PST] call: glacier [\"--region=us-west-2\",\"vault\",\"create\",\"glacier-7e5c0010-2634-4a5e-bc7b-6fea84b8b947\"]
git-annex: Failed creating glacier vault.
\"\"\"]]
What am I missing?
Also, why is it trying to *create* the valut? It's already there with content in it!
"""]]

View file

@ -0,0 +1,2 @@
I would like to be able to set 'annex-ignore' for remote servers through the webapp.
Maybe a checkbox beneath "Syncing enabled" with something like "Also sync content" that it's checked by default?