3eaaec3113
This avoids import with --no-content and with --content potentially generating two different trees, leading to a merge conflict when run in two different clones of a repo. And it's necessary groundwork to make git-annex sync --no-content import from special remotes that support importKey. Only the directory special remote currently supports importKey, and it generates the same key as git-annex usually does, so there is no behavior change for it. Future special remotes will need to take care when adding importKey, if it generates different keys. Added some warnings about that to comments. This commit was sponsored by Noam Kremen on Patreon. |
||
|---|---|---|
| .. | ||
| adjusted_branches | ||
| assistant | ||
| encryption | ||
| exporting_trees_to_special_remotes | ||
| external_backend_protocol | ||
| external_special_remote_protocol | ||
| git-remote-daemon | ||
| iabackup | ||
| metadata | ||
| new_repo_versions | ||
| p2p_protocol | ||
| requests_routing | ||
| adjusted_branches.mdwn | ||
| assistant.mdwn | ||
| balanced_preferred_content.mdwn | ||
| caching_database.mdwn | ||
| encryption.mdwn | ||
| exporting_trees_to_special_remotes.mdwn | ||
| external_backend_protocol.mdwn | ||
| external_special_remote_protocol.mdwn | ||
| gcrypt.mdwn | ||
| git-remote-daemon.mdwn | ||
| iabackup.mdwn | ||
| importing_trees_from_special_remotes.mdwn | ||
| metadata.mdwn | ||
| new_repo_versions.mdwn | ||
| p2p_protocol.mdwn | ||
| preferred_content.mdwn | ||
| requests_routing.mdwn | ||
| roadmap.mdwn | ||