diff options
author | 2016-04-12 14:28:38 -0400 | |
---|---|---|
committer | 2016-04-12 14:28:38 -0400 | |
commit | b6459fda928085b0b97cbe7929628c848f29d587 (patch) | |
tree | 0738d23a11ca565a5560537c4636d1299ac95e1a | |
parent | 5ef5ed4f0011da1e1a9eabbf99d1e15475419948 (diff) |
update
-rw-r--r-- | doc/design/adjusted_branches.mdwn | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 49b9e9dd7..79231247c 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -178,6 +178,18 @@ branch. TODO These changes would need to be committed to the adjusted branch, otherwise `git diff` would show them. +How to avoid making a new commit each time a single object is +added/removed? That seems too expensive in both CPU and dangling git +objects for old versions of the adjusted branch. It would be fine if +`git annex get` and `git annex drop` only re-adjusted the branch one time +at the end. OTOH, when should the assistant re-adjust the branch? + +Maybe instead of re-adjusting the branch after each file, stage the +worktree change, and hold off on committing. Then when a commit is +eventually made, the reverse adjusting to propigate it to master would need +to make sure to not remove files that were deleted as part of the commit, +if their content is not present. + [WORKTREE: Simply adjust the work tree (and index) per the adjustment.] ## reverse adjusting commits @@ -221,7 +233,8 @@ too problimatic. Ah, but we know that when adjustment #2 is in place, any file that `git annex get` could act on is not in the index. So, it could look at the master branch -instead. (Same for `git annex move --from` and `git annex copy --from`) +instead. (Same for `git annex move --from` and `git annex copy --from` and +the assistant.) OTOH, if adjustment #1 is in place and not #2, a file might be renamed in the index, and `git annex get $newname` should work. So, it should look at the |