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

This commit is contained in:
Joey Hess 2018-04-16 12:20:36 -04:00
commit 8d08ccb710
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 91 additions and 0 deletions

View file

@ -0,0 +1,44 @@
### Please describe the problem.
git annex version
sh: loadlocale.c:129: _nl_intern_locale_data: Assertion `cnt < (sizeof (_nl_value_type_LC_TIME) / sizeof (_nl_value_type_LC_TIME[0]))' failed.
Aborted
### What steps will reproduce the problem?
git annex version
### What version of git-annex are you using? On what operating system?
[[!format sh """
Synology NAS, 32-bit prebuilt version
wget https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-i386.tar.gz
--2018-04-08 04:26:29-- https://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-i386.tar.gz
Resolving downloads.kitenet.net... 66.228.36.95, 2600:3c03::f03c:91ff:fe73:b0d2
Connecting to downloads.kitenet.net|66.228.36.95|:443... connected.
HTTP request sent, awaiting response... 200 OK
Length: 60787901 (58M) [application/x-gzip]
Saving to: 'git-annex-standalone-i386.tar.gz'
100%[================================================================================================================================================================================================================================================>] 60,787,901 1.52MB/s in 39s
2018-04-08 04:27:09 (1.49 MB/s) - 'git-annex-standalone-i386.tar.gz' saved [60787901/60787901]
"""]]
### 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,47 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="old issue bites back"
date="2018-04-16T05:53:00Z"
content="""
Sorry to bring the old issue up but we just ran into the same situation, and I wonder if any idea on how to mediate -- unlike other cases where it happens due to corrupt index, here I guess it goes about \"git-annex\" branch (or its some kind of local index cache?)
[[!format sh \"\"\"
nastase@head1:~/attention/raw_bids/stimuli$ git add README.md
nastase@head1:~/attention/raw_bids/stimuli$ git commit -m 'README for stimuli' README.md
(recording state in git...)
error: invalid object 100644 fd601b9139518bd6737ad20e55198dd1854fa0f9 for '001/92f/MD5E-s1413--241f0946a6aecfe12a7c031cb2339f9d.pklz.log'
fatal: git-write-tree: error building trees
git-annex: failed to read sha from git write-tree
CallStack (from HasCallStack):
error, called at ./Git/Sha.hs:18:15 in main:Git.Sha
nastase@head1:~/attention/raw_bids/stimuli$ git annex fsck
curl: (22) The requested URL returned error: 404 Not Found
Remote openfmri not usable by git-annex; setting annex-ignore
fsck bird_eating_1.mp4 (checksum...) ok
...
fsck ungulate_swimming_2.mp4 (checksum...) ok
(recording state in git...)
error: invalid object 100644 fd601b9139518bd6737ad20e55198dd1854fa0f9 for '001/92f/MD5E-s1413--241f0946a6aecfe12a7c031cb2339f9d.pklz.log'
fatal: git-write-tree: error building trees
git-annex: failed to read sha from git write-tree
CallStack (from HasCallStack):
error, called at ./Git/Sha.hs:18:15 in main:Git.Sha
nastase@head1:~/attention/raw_bids/stimuli$ git --version
git version 2.13.0.rc1.294.g07d810a77f
nastase@head1:~/attention/raw_bids/stimuli$ git annex version
git-annex version: 6.20180329+gitga5fe62bed-1~ndall+1
\"\"\"]]
NB The issue came earlier and I have just upgraded git from elderly 2.7.0 and git-annex-standalone from a few months back.
Any advice would be welcome
[[!meta author=yoh]]
"""]]