avoid unnecessary auto-merge when only changing a file in the branch.
Avoids doing auto-merging in commands that don't need fully current information from the git-annex branch. In particular, git annex add no longer needs to auto-merge. Affected commands: Anything that doesn't look up data from the branch, but does write a change to it. It might seem counterintuitive that we can change a value without first making sure we have the current value. This optimisation works because these two sequences are equivilant: 1. pull from remote 2. union merge 3. read file from branch 4. modify file and write to branch vs. 1. read file from branch 2. modify file and write to branch 3. pull from remote 4. union merge After either sequence, the git-annex branch contains the same logical content for the modified file. (Possibly with lines in a different order or additional old lines of course).
This commit is contained in:
parent
897bf938f6
commit
e9bfa8eaed
3 changed files with 25 additions and 5 deletions
|
@ -16,3 +16,5 @@ occurs before it has done anything, so ctrl-c should not be a problem
|
|||
there.
|
||||
|
||||
This is a delicate change, I need to take care.. --[[Joey]]
|
||||
|
||||
> [[done]] (assuming I didn't miss any cases where this is not safe!) --[[Joey]]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue