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 2021-04-14 18:50:14 -04:00
commit 4543774412
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 65 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

53
doc/bugs/crippledfs__58___annex-init_crash_when_remote_name_is.mdwn Normal file
View file

@ -0,0 +1,53 @@
git-clone makes it easy to specify a name other than "origin" via the
`--origin` option, and, as of Git 2.30.0, via the
`clone.defaultRemoteName` configuration option. Running `git annex
init` in a clone on a system where git-annex sets
`annex.crippledfilesystem` leads to a crash due to a hard-coded
"refs/remotes/origin".
[[!format sh """
cd "$(mktemp -d "${TMPDIR:-/tmp}"/ga-XXXXXXX)" || exit 1
export GIT_CONFIG_PARAMETERS="'annex.crippledfilesystem=true'"
git version
git annex version | head -1
git init -q a
git -C a commit -q --allow-empty -m c0
git -C a annex init
git clone --origin=not-origin a b
git -C b annex init
"""]]
```
git version 2.31.1.424.g95a8dafae5
git-annex version: 8.20210331-g17646b0b3
init (scanning for unlocked files...)
Entering an adjusted branch where files are unlocked as this filesystem does not support locked files.
Switched to branch 'adjusted/master(unlocked)'
ok
(recording state in git...)
Cloning into 'b'...
done.
init (merging not-origin/git-annex into git-annex...)
(scanning for unlocked files...)
fatal: refs/remotes/origin/master: not a valid SHA1
git-annex: git [Param "update-ref",Param "refs/heads/master",Param "refs/remotes/origin/master"] failed
CallStack (from HasCallStack):
error, called at ./Git/Command.hs:42:17 in main:Git.Command
failed
git-annex: init: 1 failed
```
Thanks in advance for taking a look.
Update: Before posting, I should have tried to trigger this without
overriding `annex.crippledfilesystem`. Entering an adjusted branch in
`a` is sufficient to trigger this.
[[!tag projects/datalad]]

12
doc/todo/import_from_directory_does_not_use_cp_--reflink__63___/comment_7_b57afb61d622d9f5b2555e7d80d0ff4e._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 7"
date="2021-04-14T20:46:05Z"
content="""
> Implemented CoW for directory special remote, comprehensively.
woohoo -- I will give it a shot! (might as well just interrupt ongoing \"process\")
it is good that it copies content -- that is the point for use of CoW here - to gain a full copy of the content virtually at no (storage) cost, so if original directory gets it changed - its copy would be all nicely versioned etc in the git-annex land ;)
"""]]