From fdfd56c647d685ad5618917341db0b7c97e1b63a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Apr 2016 14:24:00 -0400 Subject: avoid withWorkTreeRelated affecting annex symlink calculation --- doc/design/adjusted_branches.mdwn | 2 -- 1 file changed, 2 deletions(-) (limited to 'doc/design') diff --git a/doc/design/adjusted_branches.mdwn b/doc/design/adjusted_branches.mdwn index 2b2e37a27..e94439d66 100644 --- a/doc/design/adjusted_branches.mdwn +++ b/doc/design/adjusted_branches.mdwn @@ -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. -- cgit v1.2.3