From mboxrd@z Thu Jan  1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham
	autolearn_force=no version=3.4.4
Received: (qmail 23159 invoked from network); 25 Jul 2021 20:35:18 -0000
Received: from 1ess.inri.net (216.126.196.35)
  by inbox.vuxu.org with ESMTPUTF8; 25 Jul 2021 20:35:18 -0000
Received: from mimir.eigenstate.org ([206.124.132.107]) by 1ess; Sun Jul 25 16:27:40 -0400 2021
Received: from abbatoir.myfiosgateway.com (pool-74-108-56-225.nycmny.fios.verizon.net [74.108.56.225])
	by mimir.eigenstate.org (OpenSMTPD) with ESMTPSA id 9d3a3a96 (TLSv1.2:ECDHE-RSA-AES256-SHA:256:NO)
	for <9front@9front.org>;
	Sun, 25 Jul 2021 13:20:37 -0700 (PDT)
Message-ID: <F802E56D1FEEF0F6819EF82923ED6EFA@eigenstate.org>
To: 9front@9front.org
Date: Sun, 25 Jul 2021 16:20:35 -0400
From: ori@eigenstate.org
In-Reply-To: <CABB-WO-DoKmFJZ-pokzkaFMsHA_6Eah0VR2dbUH8ThY8B12oMw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="US-ASCII"
Content-Transfer-Encoding: 7bit
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: generic structured property TOR over TOR session browser-based backend 
Subject: Re: [9front] sysupdate: no common ancestors
Reply-To: 9front@9front.org
Precedence: bulk

Quoth Stuart Morrow <morrow.stuart@gmail.com>:
> Yesterday's error was different: invalid ref. Obviously related, but I
> don't know what caused yesterday's.
> 
> I don't want to look into the code when, tbh, I barely even understand
> the concepts.
> By the same token, there's no poking around in .git I could have done
> to cause this. Came out of the blue.
> 
> Anyone know what's going on?
> 
> % sysupdate
> git/query: resolve: no common ancestor
> git/query: resolve: no common ancestor
> ours: 403149d7de4dbe4cc4b1fd9cb3a164e51dbccc15
> theirs: 28f76455d39d990b47c6e46e18158f0a9ba09d25
> git/query: resolve: no common ancestor
> common:
> git/merge remotes/THEM/front
> 
> I find the multiple prints of the same error, always interleaved with
> the other stuff in the same order, curious.  Invalid ref was like that
> too.

I have no idea how you'd have a commit that doesn't link back to the
rest of the commit chain.

Can you do

	git/log -c 403149d7de4dbe4cc4b1fd9cb3a164e51dbccc15 >/tmp/log.40314
	git/log -c 28f76455d39d990b47c6e46e18158f0a9ba09d25 >/tmp/log.28f76

and attach the files?