Re: stgit error on status command

From: Karl Hasselström <kha@treskal.com>
Date: Jul 8, 2008, 12:25 UTC
Message-ID: <20080708122502.GA8838@diana.vm.bytemark.co.uk>
In-Reply-To: <9e4733910807080506k6d51bc98h96a7a7b2bd56d98b@mail.gmail.com>

On 2008-07-08 08:06:04 -0400, Jon Smirl wrote:

Show 13 quoted lines

> On 7/8/08, Karl Hasselström <kha@treskal.com> wrote:
>
> > Thanks for the report.
> >
> > The problem is that we mis-parse the output of git diff-index when
> > rename detection is on (and it prints more than one filename on
> > one line). This happens if you give stg status the --diff-opts=-M
> > flag, but you didn't -- but it could also happen if you have the
> > stgit.diff-opts config variable set.
>
> I have -M in my config file. If I don't use people on lkml complain
> about renames generating piles of output in the patches. I'm able to
> work around the problem for the moment.

Oh, I'm certainly not suggesting that you shouldn't have -M in your stgit.diff-opts -- just that dropping it for the moment is a workaround to your problem.

Hmm. Another workaround is to pass an explicit --diff-opts="" to stg status; that'll override your stgit.diff-opts, and avoid triggering the bug.

But with any luck, I'll have this fixed within 4-6 hours or so.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle