git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michele Ballabio <barra_cuda@katamail.com>
To: Paul Mackerras <paulus@samba.org>
Cc: git@vger.kernel.org, "Shawn O. Pearce" <spearce@spearce.org>,
	pdmef@gmx.net
Subject: Re: [PATCH-resent] gitk: fix in procedure drawcommits
Date: Sat, 20 Oct 2007 18:02:47 +0200	[thread overview]
Message-ID: <200710201802.48111.barra_cuda@katamail.com> (raw)
In-Reply-To: <18201.54648.707559.480169@cargo.ozlabs.ibm.com>

[Rocco Rutte added on CC:, since he wrote the hg-fast-export scripts]

On Saturday 20 October 2007, Paul Mackerras wrote:
> Well no.  I'd rather understand why this is happening, in case the 
> error indicates that I'm not handling a corner case correctly.  Can
> you make a copy of the repo that triggers the bug available to me?

IIRC, I just cloned mutt's hg repo:

  hg clone http://dev.mutt.org/hg/mutt

then imported it in git with the scripts at

  http://repo.or.cz/w/fast-export.git

with

  hg-fast-export.sh -r ../mutt


After that, I've done the usual maintenance repack.

Then, running gitk and keeping pressed pgdown triggers that

	"Error: can't unset..."

window.

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 <brendan@kublai.com> 1179646159 -0700
	committer Brendan Cully <brendan@kublai.com> 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.

This commit (and many others) has two parents, but the two parents
have the same hash. So gitk tries to unset the same variable twice,
hence the error. At this point, the fix for gitk should be either to
check if the parents have the same hash when reading the commit or
avoiding to unset two times the same variable.

This explanation makes sense to me, now the problem is: have I messed
up the import myself, the scripts/commands used are to blame, or is
it entirely the original repo's fault?

Since I've redone the import and the error remains, I guess
that's not my fault :)

  reply	other threads:[~2007-10-20 15:58 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-19  5:28 gitk patch collection pull request Shawn O. Pearce
2007-10-19  7:25 ` [PATCH resend again] gitk: Do not pick up file names of "copy from" lines Johannes Sixt
2007-10-19  7:32   ` Shawn O. Pearce
2007-10-19  8:05     ` Johannes Sixt
2007-10-19  8:14       ` Shawn O. Pearce
2007-10-19 11:05 ` gitk patch collection pull request Paul Mackerras
2007-10-20  3:10   ` Shawn O. Pearce
2007-10-20 11:12   ` Jonathan del Strother
2007-10-20 11:46     ` Paul Mackerras
2007-10-20 13:00       ` Jonathan del Strother
2007-10-20 15:32         ` Jan Hudec
2007-10-19 13:44 ` [PATCH-resent] gitk: fix in procedure drawcommits Michele Ballabio
2007-10-20 10:16   ` Paul Mackerras
2007-10-20 16:02     ` Michele Ballabio [this message]
2007-10-20 18:35       ` Jan Hudec
2007-10-21  3:01       ` Paul Mackerras
2007-10-21 12:12       ` Rocco Rutte
2007-10-19 19:31 ` gitk patch collection pull request Linus Torvalds
2007-10-20  4:45   ` Paul Mackerras
2007-10-20  4:51     ` Linus Torvalds
2007-10-23  0:20       ` Paul Mackerras
2007-10-23 19:17         ` Linus Torvalds
2007-10-23 23:37           ` Paul Mackerras
2007-10-23 23:51             ` Linus Torvalds
2007-10-24  0:17               ` Paul Mackerras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200710201802.48111.barra_cuda@katamail.com \
    --to=barra_cuda@katamail.com \
    --cc=git@vger.kernel.org \
    --cc=paulus@samba.org \
    --cc=pdmef@gmx.net \
    --cc=spearce@spearce.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).