mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2019-03-18 10:48:08 -04:00
commit 5d005884eb
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
8 changed files with 97 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/bugs/Make_Setup.hs_work_for_cabal_new-build.mdwn Normal file
View file

@ -0,0 +1,3 @@
git-annex uses copyHook in Setup.hs to create/install man pages, .desktop file and etc.
I'm using cabal new-build/new-install to install it, and these copyHooks don't get called. I reported it to Cabal, but they replied that this should be fixed on git-annex side: https://github.com/haskell/cabal/issues/5933

1
doc/bugs/git_worktree_remove_fails.mdwn Normal file
View file

@ -0,0 +1 @@
"git worktree remove" fails if git-annex has operated on the worktree, because git expects .git in a worktree to be a file, while git-annex changes it to a symlink ([[tips/Using_git-worktree_with_annex/]]). Also, git-annex-test does not currently seem to test git-annex operation on worktrees added by git-worktree?

32
doc/forum/Checking_that_everything_is_committed.mdwn Normal file
View file

@ -0,0 +1,32 @@
I use this to check that git repos have nothing untracked:
# 1st command: check index against HEAD
# 2nd command: check working tree against index
# 3rd command: check for untracked files
# 4th command: check for stashes
git diff-index --quiet --cached HEAD \
&& git diff-files --quiet \
&& test -z "$(git status --porcelain)" \
&& test -z "$(git stash list)"
The call to git-diff-files(1) fails in a v7 repo with output like this (if I drop the `--quiet`):
spwhitton@iris:~/lib/athena-apt>git diff-files
:100644 100644 f8e47b9532ea17ac825c39bddc35dbd68f120a46 0000000000000000000000000000000000000000 M dists/buster-backports/main/binary-amd64/Packages
:100644 100644 f8e47b9532ea17ac825c39bddc35dbd68f120a46 0000000000000000000000000000000000000000 M dists/buster-backports/main/binary-i386/Packages
:100644 100644 f8e47b9532ea17ac825c39bddc35dbd68f120a46 0000000000000000000000000000000000000000 M dists/buster/main/binary-amd64/Packages
:100644 100644 f8e47b9532ea17ac825c39bddc35dbd68f120a46 0000000000000000000000000000000000000000 M dists/buster/main/binary-i386/Packages
:100644 100644 f8e47b9532ea17ac825c39bddc35dbd68f120a46 0000000000000000000000000000000000000000 M dists/rc-buggy/main/binary-amd64/Packages
:100644 100644 f8e47b9532ea17ac825c39bddc35dbd68f120a46 0000000000000000000000000000000000000000 M dists/rc-buggy/main/binary-i386/Packages
:100644 100644 f8e47b9532ea17ac825c39bddc35dbd68f120a46 0000000000000000000000000000000000000000 M dists/sid/main/binary-amd64/Packages
:100644 100644 f8e47b9532ea17ac825c39bddc35dbd68f120a46 0000000000000000000000000000000000000000 M dists/sid/main/binary-i386/Packages
:100644 100644 f8e47b9532ea17ac825c39bddc35dbd68f120a46 0000000000000000000000000000000000000000 M dists/stretch/main/binary-amd64/Packages
:100644 100644 f8e47b9532ea17ac825c39bddc35dbd68f120a46 0000000000000000000000000000000000000000 M dists/stretch/main/binary-i386/Packages
I note that the listed files are empty.
Is there a git-annex command that I can run to normalise my repo so that git-diff-files(1) produces no output? Or does it not make sense to run git-diff-files(1) in a v7 repo?
Thanks.
--spwhitton

8
doc/forum/Problems_using_blake2_backend/comment_2_02e630afa29ebb0d54997f0e54fc70a6._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="maryjil2596"
avatar="http://cdn.libravatar.org/avatar/2ce6b78d907f10b244c92330a4f0bd00"
subject="iTunes Error 0xe8000015"
date="2019-03-18T06:42:20Z"
content="""
Nowadays, a lot of iPhone users are complaining about iTunes Error 0xe8000015. Therefore, I had shared a link <a href=\"https://itunessupport.org/blog/fix-itunes-error-0xe8000015/\">Advanced Solutions To Fix iTunes Error 0xe8000015</a> to fix all the technical issues related to iTunes. Click the link n get rid of the issue in no time.
"""]]

11
doc/forum/git_annex_hanging_in_smudge_on_2k_file_on_rpi.mdwn Normal file
View file

@ -0,0 +1,11 @@
Ok, so I just set up git-annex on by Raspberry Pi 3 B (from apt from the raspbian repos), and got it working with a phone backup workflow. (udev automation, the specifics are in [a gist](https://gist.github.com/astronouth7303/624b499d213e607617187fee6a190ed1), but I don't think I'm doing anything super weird?)
I'm encountering a problem where it apparently just spins at 100% CPU on a small text file.
The command that's hanging is `git-annex smudge --clean sdcard/Android/data/ccc71.bmw/support/crash_reports.txt`
This has happened on this file from both `git annex add` and `git annex sync` (with and without `--content`).
The file itself is 2006B in size, and just contains some plaintext information (some header-type data and a java backtrace). But this process has been running for over an hour, and it's taken exceptionally long before.
This seems really abnormal? The repo is 8.7GB overall, and it's running on an RPi from a microSD card, but taking hours to perform repository operations seem off.

25
doc/forum/git_annex_hanging_in_smudge_on_2k_file_on_rpi/comment_1_06b5d0c9c6037ffdafab6c01763061de._comment Normal file
View file

@ -0,0 +1,25 @@
[[!comment format=mdwn
username="jamie@b5676b90eec0401ca8faac7c972eaf5676891601"
nickname="jamie"
avatar="http://cdn.libravatar.org/avatar/b9aa71e237c7bc49af04ec66194be8e0"
subject="strace"
date="2019-03-16T22:17:37Z"
content="""
I attached strace, and it seems to be deadlocked?
It just spews this continuously:
--- SIGVTALRM {si_signo=SIGVTALRM, si_code=SI_TIMER, si_timerid=0, si_overrun=0, si_value={int=0, ptr=NULL}} ---
sigreturn({mask=[]}) = 84432420
futex(0x5085624, FUTEX_WAIT_PRIVATE, 5795, NULL) = ? ERESTARTSYS (To be restarted if SA_RESTART is set)
--- SIGVTALRM {si_signo=SIGVTALRM, si_code=SI_TIMER, si_timerid=0, si_overrun=0, si_value={int=0, ptr=NULL}} ---
sigreturn({mask=[]}) = 84432420
futex(0x5085624, FUTEX_WAIT_PRIVATE, 5795, NULL) = ? ERESTARTSYS (To be restarted if SA_RESTART is set)
--- SIGVTALRM {si_signo=SIGVTALRM, si_code=SI_TIMER, si_timerid=0, si_overrun=0, si_value={int=0, ptr=NULL}} ---
sigreturn({mask=[]}) = 84432420
futex(0x5085624, FUTEX_WAIT_PRIVATE, 5795, NULL) = ? ERESTARTSYS (To be restarted if SA_RESTART is set)
--- SIGVTALRM {si_signo=SIGVTALRM, si_code=SI_TIMER, si_timerid=0, si_overrun=0, si_value={int=0, ptr=NULL}} ---
sigreturn({mask=[]}) = 84432420
futex(0x5085624, FUTEX_WAIT_PRIVATE, 5795, NULL) = ? ERESTARTSYS (To be restarted if SA_RESTART is set)
"""]]

9
doc/forum/git_annex_hanging_in_smudge_on_2k_file_on_rpi/comment_2_471a44594af15057dd4781e759013627._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="jamie@b5676b90eec0401ca8faac7c972eaf5676891601"
nickname="jamie"
avatar="http://cdn.libravatar.org/avatar/b9aa71e237c7bc49af04ec66194be8e0"
subject="comment 2"
date="2019-03-17T03:29:31Z"
content="""
I just checked on it, it did eventually process that file, but `git annex sync` has been running for over 6 hours and is still going.
"""]]

8
doc/tips/splitting_a_repository/comment_2_2437e95397e1b06ade5360405e399591._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="sameerds"
avatar="http://cdn.libravatar.org/avatar/b6d36a03115d3ececaafe16e327e9e27"
subject="did not work for me"
date="2019-03-16T10:07:09Z"
content="""
I tried this on a version 7 repo, and nothing happened. The \"git annex fsck --fast\" returned immediately. Is there any git stuff missing in the above instructions? I would expect that we should at least setup the refs correctly and check out a working directory, right?
"""]]