On 2008-06-03 08:56:38 +0100, Catalin Marinas wrote:

quoted text
> On 02/06/2008, Karl Hasselström <kha@treskal.com> wrote:
>
> > I fixed the first problem, and while doing so noticed that a
> > nearby block of code had exactly the same bug. So I fixed that as
> > well.
>
> That was fast :-). thanks.

Jakub reported the bug right before I was about to start hacking
anyway. :-)

quoted text
> >  Catalin, this should go on the stable branch, I believe. It
> >  probably warrants a new release too, since anyone rebasing
> >  patches past the point where the "Märchen" file was removed from
> >  git.git is going to hit the same bug Jakub did.
>
> Yes, it will go in both stable and master. There are some more
> patches on stable already, I'll try to release 0.14.3 this weekend.

Splendid. You can pull from my "stable" branch if you like.

quoted text
> Is the new infrastructure affected? We haven't got to the point of
> converting "rebase" yet (doesn't have all the functionality it needs
> in the new infrastructure).

The problem wasn't actually about rebase. It was about mangling of
diff-index and diff-files output in tree_status(). I think if one were
to look closely, a largish number of commands would be found to be
affected.

The new infrastructure won't have this problem, by virtue of not
having any such calls yet. Plus, I try to use the -z flag whenever I
can from the outset.

quoted text
> BTW, I created a new lib.git.Branch class as the parent of
> lib.git.Stack and it takes care the extra things used when creating
> a new stack like setting parent and remote branches. I'll post the
> patches in the next few days.

Looking forward to it.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html