git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Derrick Stolee <stolee@gmail.com>
Subject: Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)
Date: Thu, 21 Mar 2019 10:13:14 +0100
Message-ID: <87va0cd1zp.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <xmqqpnqkst2e.fsf@gitster-ct.c.googlers.com>


On Thu, Mar 21 2019, Junio C Hamano wrote:

> Junio C Hamano <gitster@pobox.com> writes:
>
>> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>>
>>> On Wed, Mar 20 2019, Junio C Hamano wrote:
>>>
>>>> Here are the topics that have been cooking.  Commits prefixed with
>>>> '-' are only in 'pu' (proposed updates) while commits prefixed with
>>>> '+' are in 'next'.  The ones marked with '.' do not appear in any of
>>>> the integration branches, but I am still holding onto them.
>>>
>>> I have re-rolls & re-submissions of some of my stuff as a WIP, but one
>>> thing that's fallen between the cracks & should be ready for queuing is
>>> my commit-graph segfault bugfix series:
>>>
>>> https://public-inbox.org/git/20190314214740.23360-1-avarab@gmail.com/
>>
>> Thanks.  I quickly looked at the difference between the updated one
>> and the old one; will take a deeper look later.
>
> It does not seem to play well in 'pu', unfortunately.  In my local
> tests, 'pu' without this topic passes, but what I pushed out to
> public has this topic on top and t5318 does not pass for me.

It works for me when I apply the series on "pu". There's a conflict with
Stolee's ds/commit-graph-format-v2.

There's a single merge conflict with it around the "commit-graph
version" error message that needs to be resolved. Here's how I did that:
https://github.com/avar/git/commit/1d69f4ea62973de977466a2e29d116716692a05d

I.e. this conflict:

    	graph_version = *(unsigned char*)(data + 4);
    <<<<<<< HEAD
    	if (!graph_version || graph_version > 2) {
    		error(_("unsupported graph version %X"),
    		      graph_version);
    =======
    	if (graph_version != GRAPH_VERSION) {
    		error(_("commit-graph version %X does not match version %X"),
    		      graph_version, GRAPH_VERSION);
    		return NULL;
    	}

    	hash_version = *(unsigned char*)(data + 5);
    	if (hash_version != oid_version()) {
    		error(_("commit-graph hash version %X does not match version %X"),
    		      hash_version, oid_version());
    >>>>>>> commit-graph-fix-segfault-and-exit-3
    		return NULL;
    	}

Needs to be resolved as:

	graph_version = *(unsigned char*)(data + 4);
	if (!graph_version || graph_version > 2) {
		error(_("commit-graph the graph version %X is unsupported"),
		      graph_version);
		return NULL;
	}

I.e. there's a test that greps out "graph version".

I can also submit a re-roll on top of his series, but figured describing
the merge might be easier...

  reply index

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-20  3:13 Junio C Hamano
2019-03-20  4:56 ` Junio C Hamano
2019-03-20 11:23 ` Thomas Gummerer
2019-03-20 22:05 ` Rohit Ashiwal
2019-03-20 22:56   ` Thomas Gummerer
2019-03-20 23:07     ` Rohit Ashiwal
2019-03-21  0:31     ` Junio C Hamano
2019-03-20 22:42 ` Ævar Arnfjörð Bjarmason
2019-03-21  0:46   ` Junio C Hamano
2019-03-21  5:19     ` Junio C Hamano
2019-03-21  9:13       ` Ævar Arnfjörð Bjarmason [this message]
2019-03-21  9:46         ` Junio C Hamano
2019-03-21 10:37           ` Ævar Arnfjörð Bjarmason
2019-03-21 11:14             ` Duy Nguyen

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87va0cd1zp.fsf@evledraar.gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=stolee@gmail.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

git@vger.kernel.org list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git