From: Junio C Hamano <junkio@cox.net>
To: ltuikov@yahoo.com
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: SIGSEGV in merge recursive
Date: Sat, 30 Dec 2006 18:30:59 -0800 [thread overview]
Message-ID: <7vvejshk4c.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <10871.51671.qm@web31801.mail.mud.yahoo.com> (Luben Tuikov's message of "Sat, 30 Dec 2006 17:42:06 -0800 (PST)")
Luben Tuikov <ltuikov@yahoo.com> writes:
> So it appears that the fix is in "master", but not in "next".
>
> Junio, can you confirm this?
It was merged into 'next' with 1e48a691, about 2 hours after I
merged the fix 5d6b151f to 'master'. Sometimes when I have a
fix that is urgent enough, I push out only 'master' before
merging and retesting it in 'next', so it is plausible that your
fetch grabbed such a state.
next prev parent reply other threads:[~2006-12-31 2:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-29 19:49 SIGSEGV in merge recursive Luben Tuikov
2006-12-29 20:11 ` Junio C Hamano
2006-12-29 20:24 ` Luben Tuikov
2006-12-30 11:07 ` Johannes Schindelin
2006-12-30 11:46 ` Florian Weimer
2006-12-31 1:42 ` Luben Tuikov
2006-12-31 2:30 ` Junio C Hamano [this message]
2006-12-31 2:13 ` Luben Tuikov
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=7vvejshk4c.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=ltuikov@yahoo.com \
/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