From: Rocco Rutte Date: Sun, 21 Oct 2007 12:12:36 GMT Subject: Re: [PATCH-resent] gitk: fix in procedure drawcommits Message-ID: <20071021121236.GA290@localhost.daprodeges.fqdn.th-h.de> In-Reply-To: <200710201802.48111.barra_cuda@katamail.com> [ No need to Cc: me as I'm on the git list, too ] Hi, * Michele Ballabio [07-10-20 18:02:47 +0200] wrote: >Uh-oh. I think I just found the issue. That's probably a bug >somewhere in the import (either fast-export or fast-import or >the original repo, I don't know), so I'm not sure if gitk >should be patched, but since the resulting repo seems correct >as far as git is concerned (i.e. git fsck --full --strict >doesn't complain), I guess something should be done. >Here is the culprit (or so I think). One of the guilty commits is: > commit a3b4383d69e0754346578c85ba8ff7c05bd88705 > tree 1bf99cd22abe97c59f8c0b7ad6b8244f0854b8af > parent 6d919fccf603aba995035fa0fb507aa2bd3bf0ae > parent 6d919fccf603aba995035fa0fb507aa2bd3bf0ae > author Brendan Cully 1179646159 -0700 > committer Brendan Cully 1179646159 -0700 > Forget SMTP password if authentication fails. > Thanks to Gregory Shapiro for the initial patch (I've moved the reset > from smtp_auth_sasl up to smtp_auth, and used the account API > instead of twiddling account bits by hand). Closes #2872. Oh. Yes, this is a bug in the python scripts that get merges quite wrong. I didn't notice that earlier as git doesn't complain and the contents of the repo turns out as identical. I'll push fixes (e.g. packed refs support) to the fast-export repo in Monday. With these changes, the mutt repo as well hg-crew (which has far more merges than the mutt repo) seem to work correctly (no identical parents and identical contents). Thanks for tracking it down. Still I think fast-import could warn or error out if its gets such content which doesn't really make sense... Rocco