From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 03 Oct 2008 14:59:15 GMT
Subject: Re: [PATCH] builtin-commit: avoid always using reduce_heads()
Message-ID: <20081003145915.GB3291@spearce.org>
In-Reply-To: <1223035487-2576-1-git-send-email-vmiklos@frugalware.org>

Miklos Vajna <vmiklos@frugalware.org> wrote:
> In case git merge --no-ff is used with --no-commit or we have a
> conflict, write info about if fast forwards are allowed or not to
> $GIT_DIR/MERGE_MODE.

*sigh*

$ git co -b mv/merge-noff master && git am -s <this
$ make test
...
*** t0004-unwritable.sh ***
* FAIL 1: setup
...

$ cd t && ./t0004-unwritable.sh -i -v
...
./test-lib.sh: line 237:   362 Segmentation fault      git commit -m initial
* FAIL 1: setup


I leave the debugging to you.  ;-)
 
-- 
Shawn.