On 19/02/11 22:54, Jonathan Nieder wrote: > Drat. :) > >> I'll try to reproduce this with the latest version of git. >
I can no longer reproduce the bug on my git version, 1.7.2.3. > 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. > git diff-files is behaving well too :) $ git pull --rebase <snip> $ git diff-files :000000 000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 U .gitignore :100644 100644 1e1998a470c5d16edd0f1ef038f78c0d136a2856 0000000000000000000000000000000000000000 M .gitignore $ nano .gitignore $ git add .gitignore $ git diff-files $ (sorry if you wanted me to test an earlier version; my system's moved on since that point..) X -- GPG: 4096R/5FBBDBCE -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
