From: Karl Hasselström Date: Tue, 17 Mar 2009 13:36:12 GMT Subject: Re: [StGit PATCH 1/5] Check for local changes with "goto" Message-ID: <20090317133612.GA10001@diana.vm.bytemark.co.uk> In-Reply-To: On 2009-03-17 10:51:08 +0000, Catalin Marinas wrote: > 2009/3/17 Karl Hasselström : > > > On 2009-03-16 14:56:11 +0000, Catalin Marinas wrote: > > > > > if not iw.worktree_clean(): > > >     self.__halt('Worktree not clean. Use "refresh" or "status --reset"') > > > if not iw.index.is_clean(self.stack.head): > > >     self.__halt('Index not clean. Use "refresh" or "status --reset"') > [...] > > Your version doesn't generate the "Your index and worktree are > > both dirty" warning, but I guess that's OK. > > The iw.worktree_clean() only checks whether the worktree is clean > relative to the index (I just tried "git update-index --refresh" > after "git add " and it returns 0). Yes, I know. The point I was trying to make was that your code doesn't make a difference between (iw.worktree_clean(), iw.index.is_clean(self.stack.head)) == (False, True) and (iw.worktree_clean(), iw.index.is_clean(self.stack.head)) == (False, False) But as I said, it's not really important. -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle