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

avoid withWorkTreeRelated affecting annex symlink calculation

Browse source
This commit is contained in:
Joey Hess 2016-04-08 14:24:00 -04:00
parent f41045bf19
commit 251405eca2
Failed to extract signature
5 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/design/adjusted_branches.mdwn
View file

@ -286,5 +286,3 @@ into adjusted view worktrees.]
have already been handled by updateAdjustedBranch. But, if another remote
pushed a new master at just the right time, the adjusted branch could be
rebased on top of a master that it doesn't incorporate, which is wrong.
* Annex symlinks generated in merging into an adjusted branch are badly
formed to point to the temp git dir's annex object dir.