On 2009-03-17 10:51:08 +0000, Catalin Marinas wrote: > 2009/3/17 Karl Hasselström <kha@xxxxxxxxxxx>: > > > 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 <modified file>" 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@xxxxxxxxxxx www.treskal.com/kalle -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html