Regression in gitk from git-1.5.3-rc7

Hi!

First of all thanks for this great piece of software you are providing for the community! I am a refugee from the SVN camp, BTW. ;-)

To the point...

Today I noticed a problem in gitk from git-1.5.3-rc7 package, which I think did not exist in rc5. The problem is as follows:

I am working with two parallel branches (master and stable). And I often use the cherry-pick option from gitk context menu to pick some patches from the master branch to the stable one (I cannot merge, because stable is a tracking branch of some remote SVN repository). If the picked patch does not apply cleanly on stable, I fix the problem in editor, then switch to git-gui to update the index and commit this conflicted commit to the stable branch.

Now, I go back to gitk, and *without* updating the view (using <F5> for instance), I try to cherry pick another patch from my master branch. And in such a situation I got this error from git-gui:

===== cut here =====

can't read "arcnos(6e9a6c5fdabddeac2717d810997a1c4787ec72a2)": no such
element in array
can't read "arcnos(6e9a6c5fdabddeac2717d810997a1c4787ec72a2)": no such
element in array
    while executing
"set a $arcnos($p)"
    (procedure "splitarc" line 5)
    invoked from within
"splitarc $p"
    (procedure "addnewchild" line 20)
    invoked from within
"addnewchild $newhead $oldhead"
    (procedure "cherrypick" line 26)
    invoked from within
"cherrypick"
    invoked from within
".rowctxmenu invoke active"
    ("uplevel" body line 1)
    invoked from within
"uplevel #0 [list $w invoke active]"
    (procedure "tk::MenuInvoke" line 50)
    invoked from within
"tk::MenuInvoke .rowctxmenu 1"
    (command bound to event)

===== cut here =====

BTW, the patch which I am trying to cherry-pick to stable is correctly committed, but gitk is not usable any more (I need to close it and start again).

The above described problem does not occur when I refresh the gitk tree manually before cherry-picking another commit.

Best regards, /Adam