From: "Shawn O. Pearce" <spearce@spearce.org>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: jnareb@gmail.com, Johannes.Schindelin@gmx.de,
git@vger.kernel.org, SZEDER GGGbor <szeder@ira.uka.de>
Subject: Re: [PATCH] builtin-commit: avoid always using reduce_heads()
Date: Mon, 6 Oct 2008 07:19:03 -0700 [thread overview]
Message-ID: <20081006141903.GB7684@spearce.org> (raw)
In-Reply-To: <1223236300-2170-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.
> On Fri, Oct 03, 2008 at 07:59:15AM -0700, "Shawn O. Pearce" <spearce@spearce.org> wrote:
> > ./test-lib.sh: line 237: 362 Segmentation fault git commit -m
> > initial
> > * FAIL 1: setup
> >
> > I leave the debugging to you. ;-)
>
> That's weird, make test passed for me before I sent this patch. It was
> based on 15dc66a.
>
> Now I squashed in Gabor's patch and rebased it against 52e8370, I hope
> it fixed the issue (make test still passes for me).
Yea, Gabor's patch squashed in is what was needed. This is already
in next; it was there on Friday. But thanks anyway.
--
Shawn.
next prev parent reply other threads:[~2008-10-06 14:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-25 23:50 [BUG] merge --no-ff --no-commit && commit SZEDER Gábor
2008-09-26 0:35 ` [PATCH] builtin-commit: avoid using reduce_heads() Miklos Vajna
2008-09-26 1:03 ` SZEDER Gábor
2008-09-26 6:24 ` Miklos Vajna
2008-09-26 15:15 ` Miklos Vajna
2008-09-26 15:20 ` [PATCH] builtin-commit: avoid always " Miklos Vajna
2008-09-26 15:52 ` Shawn O. Pearce
2008-09-26 19:37 ` Miklos Vajna
2008-10-03 2:35 ` Shawn O. Pearce
2008-10-03 12:04 ` Miklos Vajna
2008-10-03 14:59 ` Shawn O. Pearce
2008-10-05 19:51 ` Miklos Vajna
2008-10-06 14:19 ` Shawn O. Pearce [this message]
2008-10-03 15:09 ` [PATCH] builtin-commit: use reduce_heads() only when appropriate SZEDER Gábor
2008-10-05 19:43 ` Miklos Vajna
2008-09-26 16:17 ` [PATCH] builtin-commit: avoid using reduce_heads() Jakub Narebski
2008-09-26 19:31 ` Miklos Vajna
2008-09-26 23:51 ` Jakub Narebski
2008-09-29 15:07 ` Miklos Vajna
2008-09-29 18:18 ` Miklos Vajna
2008-09-29 18:44 ` Jakub Narebski
2008-09-27 0:16 ` SZEDER Gábor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081006141903.GB7684@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=szeder@ira.uka.de \
--cc=vmiklos@frugalware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).