qgit: failed assertion involving unapplied stgit patches

qgit: failed assertion involving unapplied stgit patches

[Yann DIRSON]

Hi Marco,

qgit 1.5.6 cannot show me the blame window for a given file, it complains
with the following errors:

ASSERT in getAncestor: ancestor of b617a11b801993b917e1598fd6c5a135ea74ce6f
not found
ASSERT in lookupAnnotation: no annotation for
FELIN1_DRIVERS/spi/mpc5200_spi.c

The commit for which it cannot find an ancestor is an unapplied patch,
whose preceding patch has been refreshed already (ie. there is no ref
pointing to the parent commit), and I suspect this could be the reason for
the failure. At least once I have pushed this patch and popped it again,
the assertion does not show any more.

However, I'm not sure why it walks this part of the tree, since the
per-file history view does not show unapplied patches (it would be great to
see them, though, as well as showing applied patches as such).

Best regards,
--
Yann



" Ce courriel et les documents qui y sont attaches peuvent contenir des informations confidentielles. Si vous n'etes  pas le destinataire escompte, merci d'en informer l'expediteur immediatement et de detruire ce courriel  ainsi que tous les documents attaches de votre systeme informatique. Toute divulgation, distribution ou copie du present courriel et des documents attaches sans autorisation prealable de son emetteur est interdite." 

" This e-mail and any attached documents may contain confidential or proprietary information. If you are not the intended recipient, please advise the sender immediately and delete this e-mail and all attached documents from your computer system. Any unauthorised disclosure, distribution or copying hereof is prohibited."

Re: qgit: failed assertion involving unapplied stgit patches

[Marco Costalba]

On 7/20/07, Yann DIRSON <yann.dirson@sagem.com> wrote:
>
> qgit 1.5.6 cannot show me the blame window for a given file, it complains
> with the following errors:
>

Hi Yann,

Yes. I confirm it's a bug.

A patch has been pushed both for qgit 1.5.6 and for new qgit4.

> However, I'm not sure why it walks this part of the tree, since the
> per-file history view does not show unapplied patches (it would be great to
> see them, though, as well as showing applied patches as such).
>

Regarding to show unapplied patch it seems a little bit difficult
because git-log /git-rev-list does not know them, after a quick look
it would seem easier to me to show applied patches as such...I will
investigate.

BTW if you use file history viewer I would suggest to switch to new
qgit4 (git://git.kernel.org/pub/scm/qgit/qgit4.git) it requires Qt4.3
but annotation is much more powerful, follows file renames (check
against vastly renamed git repository files) and it's an order of
magnitude faster.

Marco

Re: qgit: failed assertion involving unapplied stgit patches

[Marco Costalba]

On 7/20/07, Marco Costalba <mcostalba@gmail.com> wrote:
> On 7/20/07, Yann DIRSON <yann.dirson@sagem.com> wrote:
> >
>
> Regarding to show unapplied patch it seems a little bit difficult
> because git-log /git-rev-list does not know them, after a quick look
> it would seem easier to me to show applied patches as such...I will
> investigate.
>

Yes, it was easier.

Pushed a patch to show applied patches with nice green '+'.

Thanks for bug reporting
Marco