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

reuse old imported commits

Browse source 
This avoids proliferation of different import commits for the same
trees, and makes the resulting git history nice.
This commit is contained in:
Joey Hess 2019-05-01 14:20:26 -04:00
parent 4a8f02e939
commit a32f31235a
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 51 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/todo/import_tree.mdwn
View file

@ -13,14 +13,11 @@ and `git annex sync --content` can be configured to use it.
## remaining todo
* When generating commits for an imported history, provide a stable author,
committer, and date, so the same commit sha1 is always generated.
* When the imported history has only one level and matches the last export,
there is no need to generate a merge commit, can just add a new commit on
top of the last export. A simple fast-forward.
* Detect more complex fast-forwards from the import? This may be hard..
May not be needed?
* S3 buckets can be set up to allow reads and listing by an anonymous user.
That should allow importing from such a bucket, but the S3 remote