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

This commit is contained in:
Joey Hess 2016-08-04 10:13:06 -04:00
commit 8575644269
Failed to extract signature
4 changed files with 112 additions and 0 deletions

View file

@ -0,0 +1,47 @@
### Please describe the problem.
When I do git annex add on a directory with a filename that include a "?"
I get an error:
git-annex: unknown response from git cat-file ("HEAD:./Home/wc/Icon missing","HEAD:./Home/wc/Icon\r")
CallStack (from HasCallStack):
error, called at ./Git/CatFile.hs:86:48 in main:Git.CatFile
where the file here was called "Icon?"
### What steps will reproduce the problem?
mkdir test
cd test
git init
git annex init "test"
cp ~/Desktop/Icon? .
ls
Icon?
git annex add .
git-annex: unknown response from git cat-file ("HEAD:./Icon missing","HEAD:./Icon\r")
CallStack (from HasCallStack):
error, called at ./Git/CatFile.hs:86:48 in main:Git.CatFile
### What version of git-annex are you using? On what operating system?
git-annex-6.20160619
OSX El Capitan using brew install git-annex
### 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.
"""]]
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)

View file

@ -0,0 +1,17 @@
Hi,
I recently cleaned my git history using:
git filter-branch --tree-filter 'rm -rf personal/Mail' --prune-empty HEAD
git for-each-ref --format="%(refname)" refs/original/ | xargs -n 1 git update-ref -d
git gc
I then ran:
git annex unused
But was surprised to find that it didn't report any unused files. Not surprisingly (given that I didn't touch the annex data at all so far), when looking into `.git/annex/objects/` I still find the content of all the files that are now not used anymore.
Is there a way to clean these up besides creating a fresh clone of the repository?
Thanks!

View file

@ -0,0 +1,41 @@
[[!comment format=mdwn
username="listx"
subject="comment 3"
date="2016-08-04T02:07:55Z"
content="""
I went ahead and used `git annex wanted . \"exclude=FOO\"` and it did what I wanted. For posterity, here are some other observations:
- The file that `git annex vicfg` shows was updated to include the invocation of `git annex wanted`, like this:
```
...(truncated for brevity)...
# Repository preferred contents
# (Set to \"standard\" to use a repository's group's preferred contents)
# (for k0)
wanted a71d805d-df77-42e7-97b0-ba7686c05083 = exclude=FOO
# (for web)
...(truncated for brevity)...
```
()- I noticed that the UUID above matches the UUID found in my `.git/config` file, which looks like this:
```
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote \"origin\"]
url = m0:/mnt/a/annex.git
fetch = +refs/heads/*:refs/remotes/origin/*
annex-uuid = c5c012cc-2080-481f-81bc-7f449f33490b
[branch \"master\"]
remote = origin
merge = refs/heads/master
[annex]
uuid = a71d805d-df77-42e7-97b0-ba7686c05083
version = 5
```
.
"""]]

View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="eslgastal"
subject="comment 2"
date="2016-08-04T00:56:30Z"
content="""
That was fast! Thanks again Joey.
"""]]