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

avoid unnecessary auto-merge when only changing a file in the branch.

Browse source 
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:
Joey Hess 2011-11-12 15:15:57 -04:00
parent 897bf938f6
commit e9bfa8eaed
3 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -1,6 +1,9 @@
git-annex (3.20111112) UNRELEASED; urgency=low
* merge: Improve commit messages to mention what was merged.
* Avoid 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.
-- Joey Hess <joeyh@debian.org> Sat, 12 Nov 2011 14:50:21 -0400