Merge branch 'v7'

This commit is contained in:
Joey Hess 2018-10-26 13:52:09 -04:00
commit 6fd37fb016
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
37 changed files with 528 additions and 280 deletions

View file

@ -77,3 +77,5 @@ file_%subdir%
### 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)
Yep! I already use it to move files between my laptop's HDD and SSD, and to copy files between my many SD cards. I was trying this to see if I could not have to scroll as far on my 3D printer's menu.
> [[done]] see comments --[[Joey]]

View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2018-10-26T16:53:47Z"
content="""
`git annex adjust --hide-missing` is now available to do what you want
re hiding missing files.
`git annex view` doesn't currently unlock files in a v6 repo, so it's not
usable on a crippled filesystem. That's why the cat in the transcript above
shows the symlink content which git writes to a regular file when in a
crippled filesystem.
I would like to eventually unify adjust with view, so `git annex adjust
--unlock` can be used with a view, which would support that.
See [[todo/unify_adjust_with_view]].
"""]]

View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2018-10-26T17:04:09Z"
content="""
Have you ever seen this again or have any more information about how to
reproduce it?
This seems similar to the problem fixed by [[!commit a13c0ce66c6dd5d8cf5b09ee2fc5a58f43db4b14]]
but the version you were using already had that commit in it.
"""]]

View file

@ -377,3 +377,5 @@ total 12
lil' positive end note mode on:
git-annex is the only thing to which I trust my archive of most valuable documents and memories!
> [[done]]; see comments --[[Joey]]

View file

@ -5,6 +5,7 @@
subject="comment 4"
date="2018-10-18T23:34:26Z"
content="""
I am stupid talking about executable files hardlinking. I think I just chmod-ed already hardlinking files, that's how I got it. No surprise.
I am ok with this quirk (executable files are not thinned), but just curious: what exactly influenced such design decision?

View file

@ -0,0 +1,24 @@
[[!comment format=mdwn
username="joey"
subject="""comment 5"""
date="2018-10-26T17:17:35Z"
content="""
[[!commit b7c8bf5274a64389ac87d6ce0388b8708c261971]] is where that was
implemented. Interestingly, its commit message does say that the annex
object file is made executable when using annex.thin.
And indeed, git add of an executable file with annex.thin set does
make the object executable and hard link to it.
But that commit contains this line that avoids hard linking:
| maybe False isExecutable destmode = copy =<< getstat
Which is what I based my earlier comment on. But without that line,
AFAIK it will behave the way you want, with the annex object and
executable worktree file being hard linked. The code also removes the
execute bit if the annex object file later ends up getting hard linked
instead to a non-executable file.
So, based on this analysis, I'm going to remove that line. And improve the
annex.thin docs slightly, and I think that's sufficient to close this bug.
"""]]