Hi again, Ximin Luo wrote:
> I'm pretty sure I was on ext4, my normal > filesystem, with no sshfs or anything like that. Drat. :) > I'll try to reproduce this with the latest version of git. Thanks. The thing to look for is whether "git diff-files" shows anything after such a conflicted rebase. "rebase --continue" doesn't refuse to continue any more in such a case, ever since v1.7.2.2~33 (Fix git rebase --continue to work with touched files, 2010-07-28). But it is still a bug if diff-files shows something after you've resolved all conflicts and marked them with "git add" --- when the stat(2) information in the index is incorrect, git has to re-read the relevant files to tell whether they've changed, which can slow things down a lot. Jonathan -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
