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

This commit is contained in:
Joey Hess 2016-11-15 11:00:04 -04:00
commit 852c4700f3
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
3 changed files with 77 additions and 0 deletions

View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="christopher@5845ecd3cef9edadd4dc084df00e1fa60ce311eb"
nickname="christopher"
avatar="http://cdn.libravatar.org/avatar/4b722efb21f38d9944730c93727bc602"
subject="comment 3"
date="2016-11-15T12:15:37Z"
content="""
Hi Joey,
I installed git-annex using the homebrew recipe from https://github.com/Homebrew/homebrew-core/blob/master/Formula/git-annex.rb, OS X 10.11.6 (15G31)
These are the dependencies reported by homebrew:
Build: ghc ✔, cabal-install ✔, pkg-config ✔
Required: gsasl ✔, libidn ✔, libmagic ✔, gnutls ✔, quvi ✔
I've re-installed using \"brew install git-annex --HEAD\" to pull in your latest commit and I can confirm that everything works as expected and the /static/ resources load correctly.
Thanks,
Chris
"""]]

View file

@ -0,0 +1,26 @@
### Please describe the problem.
I tried to use `git-annex-fsck --all --from remote` to check files on a special remote, but git-annex did a scan of the local repo instead. If I don't use the `--all` flag, it correctly checks the files on the remote (but just the files in the current checked out branch).
### What steps will reproduce the problem?
mkdir repo
mkdir special
cd repo
git init
git annex init
git annex initremote special type=directory directory=../special encryption=none
touch testfile
git annex add testfile
git annex copy testfile --to special
chmod -R +w ../special/*
rm -r ../special/*
git annex fsck --all --from special # should check special remote but checks local repo instead
git diff git-annex^ git-annex # activity log shows that it checked special remote
git annex fsck --from special # correctly checks special remote, identifies missing file
### What version of git-annex are you using? On what operating system?
6.20161012 on Ubuntu 16.10
### Have you had any luck using git-annex before?
Yes, it's been very helpful for managing large files between laptops, desktops, external storage, and remote storage.

View file

@ -0,0 +1,30 @@
[[!comment format=mdwn
username="https://launchpad.net/~stephane-gourichon-lpad"
nickname="stephane-gourichon-lpad"
avatar="http://cdn.libravatar.org/avatar/02d4a0af59175f9123720b4481d55a769ba954e20f6dd9b2792217d9fa0c6089"
subject=""Hmm, guyz? Are you serious with these scripts?" Well, what's the matter?"
date="2016-11-15T10:58:32Z"
content="""
## Wow, scary
Dilyin's comment is scary. It suggests bad things can happen, but is not very clear.
Bloated history is one thing.
Obviously broken repo is bad but can be (slowly) recovered from remotes.
Subtly crippled history that you don't notice can be a major problem (especially once you have propagated it to all your remotes to \"recover from bloat\").
## More common than it seems
There's a case probably more common than people actually report: mistakenly doing `git add` instead of `git annex add` and realizing it only after a number of commits. Doing `git annex add` at that time will have the file duplicated (regular git and annex).
Extra wish: when doing `git annex add` of a file that is already present in git history, `git-annex` could notice and tell.
## Simple solution?
Can anyone elaborate on the scripts provided here, are they safe? What can happen if improperly used or in corner cases?
* \"files are replaced with symlinks and are in the index\" -> so what ?
* \"Make sure that you don't have annex.largefiles settings that would prevent annexing the files.\" -> What would happen? Also `.gitattributes`.
Thank you.
"""]]