From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <9front-bounces@9front.inri.net>
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,UNPARSEABLE_RELAY
	autolearn=ham autolearn_force=no version=3.4.4
Received: from 9front.inri.net (9front.inri.net [168.235.81.73])
	by inbox.vuxu.org (Postfix) with ESMTP id DC71E21FE5
	for <ml@inbox.vuxu.org>; Sun, 10 Nov 2024 00:49:20 +0100 (CET)
Received: from exoco.falsifian.org ([168.235.109.198]) by 9front; Sat Nov  9 18:47:20 -0500 2024
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2020-07-31; bh=NbZFoGGAT
	buId2b3V4cOSCFeWo7UO8sSR8gEC9pW5c0=; h=from:subject:to:date;
	d=falsifian.org; b=Wuj4crQTU9CQh8woJyNKMvkTMFEZJ+wEYIJMHOLEhZPGkVt+Yfj
	jaxOJF+q2ZwiqGfr9fEMqsgq0i27ovqEBurhCALfXKxllxYqzbG0xlbpNSnQJAHnxcU9is
	EI+vjWxRZCF0MVrCwdzedrUUfszWb0ryFPR035b1WroiCYyWw15YjA0hvW65yMLCn0LPY6
	0S0ZgfELfF8AP5j22iMCulk3MlAl0t4iDOBWx+69tklm53jzByG81ipa0ejUmtXH6WuHpe
	y3BxzT3t0Cvmd0Z9T72T3F6dnBZ2x9eGWI3GiKQhcDyhpoTjPOESeIgZt+tyIJ/5d0d+5a
	ddXSHSLlZcQ==
Received: from angel.falsifian.org (198-58-130-205.on.fttn.ebox.net [198.58.130.205])
	by exoco.falsifian.org (OpenSMTPD) with ESMTPSA id 8cfcf691 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO)
	for <9front@9front.org>;
	Sat, 9 Nov 2024 23:47:20 +0000 (UTC)
Received: from localhost (angel.falsifian.org [local])
	by angel.falsifian.org (OpenSMTPD) with ESMTPA id 847a8c98
	for <9front@9front.org>;
	Sat, 9 Nov 2024 23:47:19 +0000 (UTC)
Date: Sat, 09 Nov 2024 23:47:19 +0000
To: 9front@9front.org
From: James Cook <falsifian@falsifian.org>
Message-Id: <2CJ5RGAHSC91T.1Z1JD8188WV34@falsifian.org>
User-Agent: mblaze/1.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
List-ID: <9front.9front.org>
List-Help: <http://lists.9front.org>
X-Glyph: ➈
X-Bullshit: open-source extended NoSQL-scale content-driven database 
Subject: [9front] git crash (related to file becoming directory?)
Reply-To: 9front@9front.org
Precedence: bulk

The following steps cause git/commit to die. Specifically, git/save fails w=
ith "assert failed: s[off] !=3D '".

1. Make a copy of the 9front repo (I used commit e4373dd1038fd8e0369d595283=
b032d011f28e59).
2. In a new branch, add a file at lib/ndb/local.
3. Go back to the front branch and make any other change.
3. Go back to the new branch and try to merge front.

I've included a script to reproduce below my signature. For it to
work, ./plan9front should be a freshly cloned plan9front; my script
starts with dircp because I don't want to clone from upstream every
time I test my script.

I am running into this because I maintain a private branch where I
keep things like lib/ndb/local, and I (try to) merge front into it
every time I update. I have been able to work around this bug with
dirty manual intervention. (At one point I think it was enough to
fudge the INDEX9 file by removing the entry claiming lib/ndb was
removed, but more recently I've had to fiddle with the paths passed
to git/save by git/commit; IIRC I moved lib/ndb/local to after
lib/ndb/)

--=20
James


#!/bin/rc -ex
rfork en

mkdir -p bug
dircp plan9front bug
cd bug
git/branch -n myhead
mkdir lib/ndb
touch lib/ndb/local
git/add lib/ndb/local
git/commit -m 'Add lib/ndb/local' lib/ndb/local
git/branch front
echo cromulent >> lib/words
git/commit -m 'Some change on front' lib/words
git/branch myhead
git/merge front
git/commit -m 'Merge front'