From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=ZiOn=25=vger.kernel.org=git-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,
	SPF_PASS autolearn=no autolearn_force=no version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 0D812C33CA2
	for <git@archiver.kernel.org>; Wed,  8 Jan 2020 17:34:53 +0000 (UTC)
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by mail.kernel.org (Postfix) with ESMTP id DCA3F2075D
	for <git@archiver.kernel.org>; Wed,  8 Jan 2020 17:34:52 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="CtenPC7B"
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1728811AbgAHRew (ORCPT <rfc822;git@archiver.kernel.org>);
        Wed, 8 Jan 2020 12:34:52 -0500
Received: from pb-smtp2.pobox.com ([64.147.108.71]:60106 "EHLO
        pb-smtp2.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1728132AbgAHRev (ORCPT <rfc822;git@vger.kernel.org>);
        Wed, 8 Jan 2020 12:34:51 -0500
Received: from pb-smtp2.pobox.com (unknown [127.0.0.1])
        by pb-smtp2.pobox.com (Postfix) with ESMTP id D220C3663B;
        Wed,  8 Jan 2020 12:34:49 -0500 (EST)
        (envelope-from junio@pobox.com)
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc
        :subject:references:date:in-reply-to:message-id:mime-version
        :content-type; s=sasl; bh=FEUWkCJmvF8AFdXIZTQTeTZsmZ0=; b=CtenPC
        7B9bcwbQD14abZ04nzx97U3NqjepeomneQ/EytGS/zOB/ojqwDYyWkpnHfdz48pg
        gCIyY1osYrCsLF2gCnQhzx33F81BvJip0SUX3XvLAbqdFFuQDtC1WZn0UPqmNq4v
        xaGZ/cGWbSu9GncvTNdTPMvXP5XuI22Gackx0=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc
        :subject:references:date:in-reply-to:message-id:mime-version
        :content-type; q=dns; s=sasl; b=AloOmOWx0dbyuejmrDvoSm2MRtCW3Joi
        C/PTIVNyqVdj72ywS3hZkReemiiX+/LseqJKCbUtRMoxdUS0gnfAapv6pTbM36uM
        nuzqunUHm9y/f0FDwdn9V3+BUf3RYHBSdqLwiqX58hMPTYQHAA5amzrnuBoS2CAk
        2LicQW93ONY=
Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1])
        by pb-smtp2.pobox.com (Postfix) with ESMTP id C8CC936639;
        Wed,  8 Jan 2020 12:34:49 -0500 (EST)
        (envelope-from junio@pobox.com)
Received: from pobox.com (unknown [34.76.80.147])
        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
        (No client certificate requested)
        by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 14C6136638;
        Wed,  8 Jan 2020 12:34:49 -0500 (EST)
        (envelope-from junio@pobox.com)
From:   Junio C Hamano <gitster@pobox.com>
To:     "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>
Cc:     git@vger.kernel.org, peff@peff.net, brad@brad-smith.co.uk,
        sunshine@sunshineco.com, James Coglan <jcoglan@gmail.com>,
        Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH v2 1/2] graph: fix case that hit assert()
References: <pull.517.git.1578408947.gitgitgadget@gmail.com>
        <pull.517.v2.git.1578432422.gitgitgadget@gmail.com>
        <c05fe2c37a87b254157eec1c8a0f8ca206e1cd31.1578432422.git.gitgitgadget@gmail.com>
        <xmqqd0bv3pin.fsf@gitster-ct.c.googlers.com>
Date:   Wed, 08 Jan 2020 09:34:47 -0800
In-Reply-To: <xmqqd0bv3pin.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's
        message of "Tue, 07 Jan 2020 13:50:08 -0800")
Message-ID: <xmqqa76x3l8o.fsf@gitster-ct.c.googlers.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Pobox-Relay-ID: 2B6BB814-323D-11EA-AD70-D1361DBA3BAF-77302942!pb-smtp2.pobox.com
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org

Junio C Hamano <gitster@pobox.com> writes:

> "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
>> From: Derrick Stolee <dstolee@microsoft.com>
>> Subject: Re: [PATCH v2 1/2] graph: fix case that hit assert()
>>
>> A failure was reported in "git log --graph --all" with the new
>> graph-rendering logic. The code fails an assert() statement when
>> collapsing multiple edges from a merge.
>>
>> The assert was introduced by eaf158f8 (graph API: Use horizontal
>> lines for more compact graphs, 2009-04-21), which is quite old.
>> This assert is trying to say that when we complete a horizontal
>> line with a single slash, it is because we have reached our target.
>>
>> This assertion is hit when we have two collapsing lines from the
>> same merge commit, as follows:
>>
>>     | | | | *
>>     | |_|_|/|
>>     |/| | |/
>>     | | |/|
>>     | |/| |
>>     | * | |
>>     * | | |
>
> I was sort-of expecting to see
> ...
> near the beginning of this commit, though.

Will do this locally before using them in rc2.

Thanks.