From: Nguyen Thai Ngoc Duy Date: Sat, 22 Aug 2009 11:56:32 GMT Subject: Re: [RFC PATCH v4 04/19] Teach Git to respect skip-worktree bit (reading part) Message-ID: In-Reply-To: <7vd46pf4yw.fsf@alter.siamese.dyndns.org> On Sat, Aug 22, 2009 at 12:32 AM, Junio C Hamano wrote: > Nguyen Thai Ngoc Duy writes: > >> 2009/8/20 Nguyễn Thái Ngọc Duy : >>> grep: turn on --cached for files that is marked skip-worktree >>> ls-files: do not check for deleted file that is marked skip-worktree >>> update-index: ignore update request if it's skip-worktree, while still allows removing >>> diff*: skip worktree version >> >> I kept reminding myself and still managed to miss it. skip-worktree >> bit is not completely independent from assume-unchanged. It shares >> CE_MATCH_IGNORE_VALID flag in ie_match_stat(). Should have mentioned >> that in commit log. I should have just renamed it to CE_MATCH_PARANOID. That would fit both assume-unchanged and skip-worktree bits. > Yeah, that is why I feel uneasy reading your response to my other message: > >  This series does not fix assume-unchanged bit. I'd like to focus on >  skip-worktree bit now. ... I don't know if I understand assume-unchanged >  semantics correctly anymore :-) The thing is there are grey areas where assume-unchanged is used. If worktree version is there and really uptodate, nothing to worry about. We seemed to care of local changes in assume-unchanged files, but that's not written in stone. So I started off with a new bit, clearer semantics. Perhaps new changes could be applied back to assume-unchanged bit, but I'd stay away from that for now. -- Duy