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-02-17 20:46:35 -04:00
commit 06eab90d44
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/git-annex-import.mdwn
View file

@ -105,15 +105,17 @@ the tree of files on the remote, even when importing into a subdirectory.
# IMPORTING FROM A DIRECTORY # IMPORTING FROM A DIRECTORY
When run with a path, `git annex import` moves files from somewhere outside When run with a path, `git annex import` **moves** files from somewhere outside
the git working copy, and adds them to the annex. the git working copy, and adds them to the annex. In contrast to importing
from a special directory remote, imported files are **deleted from the given path**.
This is a legacy interface. It is still supported, but please consider This is a legacy interface. It is still supported, but please consider
switching to importing from a directory special remote instead, using the switching to importing from a directory special remote instead, using the
interface documented above. interface documented above.
Individual files to import can be specified. If a directory is specified, Individual files to import can be specified. If a directory is specified,
the entire directory is imported. the entire directory is imported. Please note that the following instruction
will **delete all files from the source directory**.
git annex import /media/camera/DCIM/* git annex import /media/camera/DCIM/*

11
doc/git-annex-import/comment_1_8961635a772b4ddb5ba1e04a50034e6a._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="georg.schnabel@bd6be2144f897f5caa0028e0dd1e0a65634add81"
nickname="georg.schnabel"
avatar="http://cdn.libravatar.org/avatar/b58e4e0101a95b57d55da575ca21f510"
subject="import from special directory remote fails due to running out of memory "
date="2021-02-17T14:29:49Z"
content="""
First of all, git annex is an awesome tool, I like it very much!
When trying to `git annex import` from a special directory remote with a large number of files (~4 millions) with a cumulative size of about 1TB, git annex takes up all main memory during the final update remote/ref step on a machine with 16G of main memory and is then killed by the system. This also happens when supplying the `--no-content` option. Is there a way to make git annex less memory demanding when importing from a special directory remote with a large number of files?
"""]]