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

Merge branch 'master' into streamproxy

Browse source
This commit is contained in:
Joey Hess 2024-10-22 09:49:28 -04:00
commit 8baccda98f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
37 changed files with 499 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/todo/option_to_not_ignore_symlinks_in_import/comment_1_45d4218e9a300034b743e27a0818cd32._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2024-10-21T15:34:26Z"
content="""
See [[bugs/git-annex-import_imports_outside_of_directory]] where following
symlinks on import turned into a serious foot bomb.
"""]]

44
doc/todo/option_to_not_ignore_symlinks_in_import/comment_2_2f372e02a123ab51e05c4a0889dffcfd._comment Normal file
View file

@ -0,0 +1,44 @@
[[!comment format=mdwn
username="matrss"
avatar="http://cdn.libravatar.org/avatar/59541f50d845e5f81aff06e88a38b9de"
subject="comment 2"
date="2024-10-21T16:32:18Z"
content="""
I understand those concerns, but I think skipping all symbolic links is doing too much in this case.
I am interested in preserving symbolic links that point at other files within the same to-be-imported directory. I think this could be done safely by either resolving the symlink and importing the target file if it is a file within the importtree directory, or just importing the symlink as a symbolic link into git. I am starting to prefer the latter, and since it wouldn't import any actual file content it would even be safe to import symlinks pointing outside of the importtree directory.
This is what a small part of these datasets looks like:
```
.
├── 0630_1
│   ├── falcon_avionik.nc -> ../falcon/nasa/avionik/bin/cmet_080630a.nc
│   ├── falcon_cmet.nc -> ../falcon/nasa/cmet/bin/f080630a_TG_all_V3.nc
│   ├── falcon_fish.nc -> ../falcon/fish/bin/ff080630_1.dat.1_s.CALC.nc
│   ├── falcon_jno2.nc -> ../falcon/nasa/jno2/bin/JNO2_final_F080630a.nc
<...>
├── falcon
│   ├── fish
│   │   ├── bin
│   │   │   ├── ff080630_1.dat.1_s.CALC.nc
<...>
│   ├── nasa
│   │   ├── avionik
│   │   │   ├── bin
│   │   │   │   ├── cmet_080630a.nc
<...>
│   │   ├── cmet
│   │   │   ├── bin
│   │   │   │   ├── f080630a_TG_all_V3.nc
<...>
│   │   └── jno2
│   │   ├── bin
│   │   │   ├── JNO2_final_F080630a.nc
<...>
```
I would like to meaningfully preserve these symbolic links when using `git annex import`. Right now these paths are simply missing after the import.
I think @Ilya_Shlyakhter has been asking for this as well in the linked bug report.
"""]]

12
doc/todo/specify_freeze__47__thaw_scripts_relative_to_topdir/comment_2_177eca67577662447d39502e25776282._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2024-10-21T15:25:22Z"
content="""
One simple solution is the put the script somewhere in PATH and then set
the config to the name of the script rather than its location.
In the case of the freeze and thaw hooks, these are run a lot and so
git-annex shouldn't be checking if .git/hooks/annex-freeze-content exists
every time.
"""]]